@@ -30,8 +30,8 @@ ${BOLD}DESCRIPTION${RESET}
3030
3131${BOLD} OPTIONS${RESET}
3232\t-h --help: display this help text
33- \tdotnet: build all .Net packages
34- \tjava: build all Java packages
33+ \tdotnet: build the meta .Net package
34+ \tjava: build the meta Java package
3535\tall: build everything (default)
3636
3737${BOLD} EXAMPLES${RESET}
@@ -55,7 +55,7 @@ function assert_defined(){
5555
5656# .Net build
5757function build_dotnet() {
58- if echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " | cmp --silent " ${ROOT_DIR} /export/dotnet_build " -; then
58+ if echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " | cmp --silent " ${ROOT_DIR} /export_meta/meta_dotnet_build " -; then
5959 echo " build .Net up to date!" | tee -a build.log
6060 return 0
6161 fi
@@ -75,32 +75,32 @@ function build_dotnet() {
7575
7676 $OPENSSL_PRG aes-256-cbc -iter 42 -pass pass:" $ORTOOLS_TOKEN " \
7777 -in " ${RELEASE_DIR} " /or-tools.snk.enc \
78- -out " ${ROOT_DIR} " /export /or-tools.snk -d
79- DOTNET_SNK=export /or-tools.snk
78+ -out " ${ROOT_DIR} " /export_meta /or-tools.snk -d
79+ DOTNET_SNK=export_meta /or-tools.snk
8080 echo " DONE" | tee -a build.log
8181
8282 # Clean dotnet
8383 echo -n " Clean .Net..." | tee -a build.log
8484 cd " ${ROOT_DIR} " || exit 2
85- rm -rf " ${ROOT_DIR} /temp_dotnet "
85+ rm -rf " ${ROOT_DIR} /temp_meta_dotnet "
8686 echo " DONE" | tee -a build.log
8787
8888 echo -n " Build .Net..." | tee -a build.log
89- cmake -S. -Btemp_dotnet -DBUILD_SAMPLES=OFF -DBUILD_EXAMPLES=OFF \
89+ cmake -S. -Btemp_meta_dotnet -DBUILD_SAMPLES=OFF -DBUILD_EXAMPLES=OFF \
9090 -DBUILD_DOTNET=ON -DUSE_DOTNET_462=ON -DUNIVERSAL_DOTNET_PACKAGE=ON
91- cmake --build temp_dotnet -j8 -v
91+ cmake --build temp_meta_dotnet -j8 -v
9292 echo " DONE" | tee -a build.log
93- # cmake --build temp_dotnet --target test
93+ # cmake --build temp_meta_dotnet --target test
9494 # echo "cmake test: DONE" | tee -a build.log
9595
9696 # copy nupkg to export
97- cp temp_dotnet /dotnet/packages/Google.OrTools.9.* nupkg export /
98- echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " > " ${ROOT_DIR} /export/dotnet_build "
97+ cp temp_meta_dotnet /dotnet/packages/Google.OrTools.9.* nupkg export_meta /
98+ echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " > " ${ROOT_DIR} /export_meta/meta_dotnet_build "
9999}
100100
101101# Java build
102102function build_java() {
103- if echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " | cmp --silent " ${ROOT_DIR} /export/java_build " -; then
103+ if echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " | cmp --silent " ${ROOT_DIR} /export_meta/meta_java_build " -; then
104104 echo " build Java up to date!" | tee -a build.log
105105 return 0
106106 fi
@@ -147,7 +147,7 @@ function build_java() {
147147 # Clean java
148148 echo -n " Clean Java..." | tee -a build.log
149149 cd " ${ROOT_DIR} " || exit 2
150- rm -rf " ${ROOT_DIR} /temp_java "
150+ rm -rf " ${ROOT_DIR} /temp_meta_java "
151151 echo " DONE" | tee -a build.log
152152
153153 echo -n " Build Java..." | tee -a build.log
@@ -159,22 +159,22 @@ function build_java() {
159159 fi
160160
161161 # shellcheck disable=SC2086: cmake fail to parse empty string ""
162- cmake -S. -Btemp_java -DBUILD_SAMPLES=OFF -DBUILD_EXAMPLES=OFF \
162+ cmake -S. -Btemp_meta_java -DBUILD_SAMPLES=OFF -DBUILD_EXAMPLES=OFF \
163163 -DBUILD_JAVA=ON -DUNIVERSAL_JAVA_PACKAGE=ON \
164164 -DSKIP_GPG=OFF ${GPG_EXTRA}
165- cmake --build temp_java -j8 -v
165+ cmake --build temp_meta_java -j8 -v
166166 echo " DONE" | tee -a build.log
167- # cmake --build temp_java --target test
167+ # cmake --build temp_meta_java --target test
168168 # echo "cmake test: DONE" | tee -a build.log
169169
170170 # copy meta jar to export
171171 # if [ ${PLATFORM} == "aarch64" ]; then
172- # cp temp_java /java/ortools-linux-aarch64/target/*.jar* export /
172+ # cp temp_meta_java /java/ortools-linux-aarch64/target/*.jar* export_meta /
173173 # else
174- # cp temp_java /java/ortools-linux-x86-64/target/*.jar* export /
174+ # cp temp_meta_java /java/ortools-linux-x86-64/target/*.jar* export_meta /
175175 # fi
176- cp temp_java /java/ortools-java/target/* .jar* export /
177- echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " > " ${ROOT_DIR} /export/java_build "
176+ cp temp_meta_java /java/ortools-java/target/* .jar* export_meta /
177+ echo " ${ORTOOLS_BRANCH} ${ORTOOLS_SHA1} " > " ${ROOT_DIR} /export_meta/meta_java_build "
178178}
179179
180180# Cleaning everything
@@ -184,9 +184,9 @@ function reset() {
184184 cd " ${ROOT_DIR} " || exit 2
185185
186186 make clean
187- rm -rf temp_dotnet
188- rm -rf temp_java
189- rm -rf export
187+ rm -rf temp_meta_dotnet
188+ rm -rf temp_meta_java
189+ rm -rf export_meta
190190 rm -f ./* .gpg
191191 rm -f ./* .log
192192 rm -f ./* .whl
@@ -217,7 +217,7 @@ function main() {
217217 local -r ORTOOLS_SHA1=$( git rev-parse --verify HEAD)
218218 local -r PLATFORM=$( uname -m)
219219
220- mkdir -p " ${ROOT_DIR} /export "
220+ mkdir -p " ${ROOT_DIR} /export_meta "
221221
222222 case ${1} in
223223 dotnet|java)
0 commit comments