reorganize mac deps install script files and build process

trishullab · Jul 14, 2017 · 88a94b1 · 88a94b1
1 parent 935b540
commit 88a94b1
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 29 deletions.
diff --git a/...lease/ubuntu_16_4/install_dependencies.sh → ...inary_release/install_dependencies_apt.sh b/...lease/ubuntu_16_4/install_dependencies.sh → ...inary_release/install_dependencies_apt.sh
diff --git a/...e/ubuntu_16_4/install_dependencies_mac.sh → ...inary_release/install_dependencies_mac.sh b/...e/ubuntu_16_4/install_dependencies_mac.sh → ...inary_release/install_dependencies_mac.sh
diff --git a/...binary_release/ubuntu_16_4/start_bayou.sh → src/main/bash/binary_release/start_bayou.sh b/...binary_release/ubuntu_16_4/start_bayou.sh → src/main/bash/binary_release/start_bayou.sh
diff --git a/.../binary_release/ubuntu_16_4/synthesize.sh → src/main/bash/binary_release/synthesize.sh b/.../binary_release/ubuntu_16_4/synthesize.sh → src/main/bash/binary_release/synthesize.sh
diff --git a/...es/bash_4_3/build_binary_release/build.sh → tool_files/build_binary_release/build.sh b/...es/bash_4_3/build_binary_release/build.sh → tool_files/build_binary_release/build.sh
@@ -1,4 +1,4 @@
-ls#!/bin/bash
+#!/bin/bash
 
 # Copyright 2017 Rice University
 #
@@ -14,19 +14,16 @@ ls#!/bin/bash
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apt-get update
-apt-get install openjdk-8-jdk maven zip
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd ../../maven_3_3_9/bayou
+cd ../maven_3_3_9/bayou
 mvn clean package
 cp target/bayou-1.0.0-jar-with-dependencies.jar $SCRIPT_DIR
 cp -r ../../../src/main/python $SCRIPT_DIR
 cp -r ../../../src/main/resources $SCRIPT_DIR
-cp ../../../src/main/bash/binary_release/ubuntu_16_4/*.sh $SCRIPT_DIR
+cp ../../../src/main/bash/binary_release/*.sh $SCRIPT_DIR
 cp -r target/bayou-1.0.0-jar-with-dependencies.jar $SCRIPT_DIR
 cp -r ../../../example_inputs $SCRIPT_DIR
 cd $SCRIPT_DIR
 mv bayou-1.0.0-jar-with-dependencies.jar bayou-1.0.0.jar
-zip -r bayou-1.0.0-ubuntu-16.01.zip bayou-1.0.0.jar example_inputs install_dependencies.sh start_bayou.sh synthesize.sh python resources
-rm -r bayou-1.0.0.jar example_inputs install_dependencies.sh start_bayou.sh synthesize.sh python resources 
+zip -r bayou-1.0.0.zip bayou-1.0.0.jar example_inputs install_dependencies_apt.sh install_dependencies_mac.sh start_bayou.sh synthesize.sh python resources
+rm -r bayou-1.0.0.jar example_inputs install_dependencies_apt.sh install_dependencies_mac.sh start_bayou.sh synthesize.sh python resources
diff --git a/tool_files/build_scripts/install_deps.sh → .../build_binary_release/install_deps_apt.sh b/tool_files/build_scripts/install_deps.sh → .../build_binary_release/install_deps_apt.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 
 apt-get update
-apt-get install openjdk-8-jdk maven
+apt-get install openjdk-8-jdk maven zip
diff --git a/tool_files/build_scripts/build.sh b/tool_files/build_scripts/build.sh
@@ -26,7 +26,7 @@ mvn clean package
 cp target/bayou-1.0.0-jar-with-dependencies.jar $BUILD_DIR
 cp -r ../../../src/main/python $BUILD_DIR
 cp -r ../../../src/main/resources $BUILD_DIR
-cp ../../../src/main/bash/binary_release/ubuntu_16_4/*.sh $BUILD_DIR
+cp ../../../src/main/bash/binary_release/*.sh $BUILD_DIR
 cp  target/bayou-1.0.0-jar-with-dependencies.jar $BUILD_DIR
 cp -r ../../../example_inputs $BUILD_DIR
 cd $BUILD_DIR

diff --git a/tool_files/build_scripts/install_deps_mac.sh b/tool_files/build_scripts/install_deps_mac.sh