ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shiro615 wants to merge 9 commits into from
Closed

ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh #4749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
56098ae
[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh
shiro615 Jun 29, 2019
e04276e
Remove libraries for C++ build
shiro615 Jun 29, 2019
aa78680
Enable test test_glib_configure on Travis CI
shiro615 Jun 29, 2019
70cb4a7
Remove an unnecessary diff
shiro615 Jun 29, 2019
e357a88
Exclude c_glib/autom4te.cache/* from RAT check
shiro615 Jun 29, 2019
46a4f89
Use docker-compose
kou Jul 3, 2019
501a2dd
Remove autom4te.cache after running autogen.sh
shiro615 Jul 3, 2019
3a2550f
Remove omit from 02-source-test.rb
shiro615 Jul 3, 2019
9a69f8e
Remove an unnecessary environment variable
shiro615 Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions dev/release/02-source-test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
end

def test_glib_configure
unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
omit("This takes a long time. " +
"Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
end
source("GLIB")
Dir.chdir("#{@tag_name}/c_glib") do
assert_equal([
Expand Down
26 changes: 11 additions & 15 deletions dev/release/02-source.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
git archive ${release_hash} --prefix ${tag}/) | \
tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
archive_name=tmp-apache-arrow
(cd "${SOURCE_TOP_DIR}" && \
git archive ${release_hash} --prefix ${archive_name}/) \
> ${archive_name}.tar
dist_c_glib_tar_gz=c_glib.tar.gz
docker_image_name=apache-arrow/release-source
DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
docker \
run \
--rm \
--interactive \
--volume "$PWD":/host \
${docker_image_name} \
/build.sh ${archive_name} ${dist_c_glib_tar_gz}
rm -f ${archive_name}.tar
> "${SOURCE_TOP_DIR}/${archive_name}.tar"
c_glib_including_configure_tar_gz=c_glib.tar.gz
"${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
release-source \
/arrow/dev/release/source/build.sh \
${archive_name} \
${c_glib_including_configure_tar_gz}
rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
rm -rf ${tag}/c_glib
tar xf ${dist_c_glib_tar_gz} -C ${tag}
rm -f ${dist_c_glib_tar_gz}
tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down
25 changes: 2 additions & 23 deletions dev/release/source/Dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \

@shiro615shiro615Jun 29, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.

apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
apt-get -y install clang-7

RUN apt update && \
apt install -y -V \
autoconf-archive \
bison \
cmake \
flex \
g++ \
gcc \
gtk-doc-tools \
libboost-filesystem-dev \
libboost-regex-dev \
libboost-system-dev \
libgirepository1.0-dev \
libglib2.0-doc \
libprotobuf-dev \
libprotoc-dev \
libtool \
lsb-release \
make \
pkg-config \
protobuf-compiler && \
pkg-config && \
apt clean && \
rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh
33 changes: 6 additions & 27 deletions dev/release/source/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
-DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DARROW_PLASMA=yes \
-DARROW_GANDIVA=yes \
-DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
--enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib
10 changes: 10 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

# TODO(kszucs): hive-integration

################################# Release ###################################

release-source:
image: arrow:release-source
build:
context: .
dockerfile: dev/release/source/Dockerfile
volumes:
- .:/arrow:delegated

######################## Verification Containers ############################

debian-stretch:
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh#4749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

shiro615
wants to merge
9
commits into

from

 Closed


ARROW-5784: [Release][GLib] Replace c_glib/ after running c_glib/autogen.sh in dev/release/02-source.sh
#4749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
56098ae

[Release][GLib] Replace c_glib/ by c_glib/ after running autogen.sh


shiro615 Jun 29, 2019
e04276e

Remove libraries for C++ build


shiro615 Jun 29, 2019
aa78680

Enable test test_glib_configure on Travis CI


shiro615 Jun 29, 2019
70cb4a7

Remove an unnecessary diff


shiro615 Jun 29, 2019
e357a88

Exclude c_glib/autom4te.cache/* from RAT check


shiro615 Jun 29, 2019
46a4f89

Use docker-compose


kou Jul 3, 2019
501a2dd

Remove autom4te.cache after running autogen.sh


shiro615 Jul 3, 2019
3a2550f

Remove omit from 02-source-test.rb


shiro615 Jul 3, 2019
9a69f8e

Remove an unnecessary environment variable


shiro615 Jul 4, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
dev/release/02-source-test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,10 +55,6 @@ def test_symbolic_links
 end

 def test_glib_configure
 unless ENV["ARROW_TEST_SOURCE_GLIB"] == "yes"
 omit("This takes a long time. " +
 "Set ARROW_TEST_SOURCE_GLIB=yes environment variable to test this.")
 end
 source("GLIB")
 Dir.chdir("#{@tag_name}/c_glib") do
 assert_equal([
Expand Down

26 changes: 11 additions & 15 deletions
dev/release/02-source.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,26 +61,22 @@ rm -rf ${tag}
 git archive ${release_hash} --prefix ${tag}/) | \
 tar xf -

# replace c_glib/ by tar.gz generated by "make dist"
# Replace c_glib/ after running c_glib/autogen.sh to create c_gilb/ source archive containing the configure script
if [ ${SOURCE_GLIB} -gt 0 ]; then
 archive_name=tmp-apache-arrow
 (cd "${SOURCE_TOP_DIR}" && \
 git archive ${release_hash} --prefix ${archive_name}/) \
 > ${archive_name}.tar
 dist_c_glib_tar_gz=c_glib.tar.gz
 docker_image_name=apache-arrow/release-source
 DEBUG=yes docker build -t ${docker_image_name} "${SOURCE_DIR}/source"
 docker \
 run \
 --rm \
 --interactive \
 --volume "$PWD":/host \
 ${docker_image_name} \
 /build.sh ${archive_name} ${dist_c_glib_tar_gz}
 rm -f ${archive_name}.tar
 > "${SOURCE_TOP_DIR}/${archive_name}.tar"
 c_glib_including_configure_tar_gz=c_glib.tar.gz
 "${SOURCE_TOP_DIR}/dev/run_docker_compose.sh" \
 release-source \
 /arrow/dev/release/source/build.sh \
 ${archive_name} \
 ${c_glib_including_configure_tar_gz}
 rm -f "${SOURCE_TOP_DIR}/${archive_name}.tar"
 rm -rf ${tag}/c_glib
 tar xf ${dist_c_glib_tar_gz} -C ${tag}
 rm -f ${dist_c_glib_tar_gz}
 tar xf "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}" -C ${tag}
 rm -f "${SOURCE_TOP_DIR}/${c_glib_including_configure_tar_gz}"
fi

# Resolve all hard and symbolic links
Expand Down

25 changes: 2 additions & 23 deletions
dev/release/source/Dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,38 +15,17 @@
# specific language governing permissions and limitations
# under the License.

FROM ubuntu:18.04
FROM debian:buster

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update -y -q && \
@shiro615shiro615Jun 29, 2019

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the libraries for building Arrow C++, because just runs c_glib/autogen.sh.
 apt-get install -y -q --no-install-recommends wget software-properties-common gpg-agent && \
 wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
 apt-add-repository -y "deb http://apt.llvm.org/bionic llvm-toolchain-bionic-7 main" && \
 apt-get -y install clang-7

RUN apt update && \
 apt install -y -V \
 autoconf-archive \
 bison \
 cmake \
 flex \
 g++ \
 gcc \
 gtk-doc-tools \
 libboost-filesystem-dev \
 libboost-regex-dev \
 libboost-system-dev \
 libgirepository1.0-dev \
 libglib2.0-doc \
 libprotobuf-dev \
 libprotoc-dev \
 libtool \
 lsb-release \
 make \
 pkg-config \
 protobuf-compiler && \
 pkg-config && \
 apt clean && \
 rm -rf /var/lib/apt/lists/*

COPY build.sh /build.sh

33 changes: 6 additions & 27 deletions
dev/release/source/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,35 +20,14 @@
set -e

archive_name=$1
dist_c_glib_tar_gz=$2
c_glib_including_configure_tar_gz=$2

tar xf /host/${archive_name}.tar
tar xf /arrow/${archive_name}.tar

# build Apache Arrow C++ before building Apache Arrow GLib because
# Apache Arrow GLib requires Apache Arrow C++.
mkdir -p ${archive_name}/cpp/build
cpp_install_dir=${PWD}/${archive_name}/cpp/install
cd ${archive_name}/cpp/build
cmake .. \
 -DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DARROW_PLASMA=yes \
 -DARROW_GANDIVA=yes \
 -DARROW_PARQUET=yes
make -j8
make install
cd -

# build source archive for Apache Arrow GLib by "make dist".
# Run autogen.sh to create c_glib/ source archive containing the configure script
cd ${archive_name}/c_glib
./autogen.sh
./configure \
 PKG_CONFIG_PATH=${cpp_install_dir}/lib/pkgconfig \
 --enable-gtk-doc
LD_LIBRARY_PATH=${cpp_install_dir}/lib make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
rm -rf autom4te.cache
cd -
mv ${archive_name}/c_glib/apache-arrow-glib-* c_glib/
tar czf /host/${dist_c_glib_tar_gz} c_glib
mv ${archive_name}/c_glib/ c_glib/
tar czf /arrow/${c_glib_including_configure_tar_gz} c_glib

10 changes: 10 additions & 0 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -609,6 +609,16 @@ services:

 # TODO(kszucs): hive-integration

 ################################# Release ###################################

 release-source:
 image: arrow:release-source
 build:
 context: .
 dockerfile: dev/release/source/Dockerfile
 volumes:
 - .:/arrow:delegated

 ######################## Verification Containers ############################

 debian-stretch:
Expand Down