From 99c11d77d808b9c5d5188d9132241a1cbd6e083d Mon Sep 17 00:00:00 2001 From: aviralg <aviral.goel@outlook.com> Date: Thu, 29 Oct 2015 12:39:38 +0530 Subject: [PATCH] Added build script to build all code in one go, modified update-repository to alleviate detached head issue in submodules --- build-moogli | 6 ++++++ build-moose | 4 ++++ build-moose-core | 7 +++++++ moogli | 2 +- moose-core | 2 +- update-repository | 2 +- 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100755 build-moogli create mode 100755 build-moose create mode 100755 build-moose-core diff --git a/build-moogli b/build-moogli new file mode 100755 index 00000000..6a5f3173 --- /dev/null +++ b/build-moogli @@ -0,0 +1,6 @@ +#!/bin/sh + +(cd moogli; make build) +local_site_package_directory=`python -c "import site; print site.getusersitepackages()"` +mkdir -p "$local_site_package_directory" +echo "`pwd`/moogli" > "$local_site_package_directory/moogli.pth" diff --git a/build-moose b/build-moose new file mode 100755 index 00000000..4b8b083d --- /dev/null +++ b/build-moose @@ -0,0 +1,4 @@ +#!/bin/sh + +sh ./build-moose-core +sh ./build-moogli diff --git a/build-moose-core b/build-moose-core new file mode 100755 index 00000000..e97b1d28 --- /dev/null +++ b/build-moose-core @@ -0,0 +1,7 @@ +#!/bin/sh + +(cd moose-core; make USE_SBML=1) +local_site_package_directory=`python -c "import site; print site.getusersitepackages()"` +mkdir -p "$local_site_package_directory" +echo "`pwd`/moose-core/python" > "$local_site_package_directory/moose.pth" + diff --git a/moogli b/moogli index 9681522f..317b31d0 160000 --- a/moogli +++ b/moogli @@ -1 +1 @@ -Subproject commit 9681522f43bbc0dde26f282138e93e5b5b85aa81 +Subproject commit 317b31d00415cc933560531a34ae6673d9ecaab2 diff --git a/moose-core b/moose-core index af822336..1d6208f2 160000 --- a/moose-core +++ b/moose-core @@ -1 +1 @@ -Subproject commit af822336e42d4e933f50f664beccadc7a17f058e +Subproject commit 1d6208f2a5cbe7cc43ac2bfd1edf43c4ee385619 diff --git a/update-repository b/update-repository index 8d1aa952..3447029a 100755 --- a/update-repository +++ b/update-repository @@ -3,4 +3,4 @@ # This script updates the repository and its subrepositories, recursively. git submodule update --init -git submodule foreach '[ "$path" = "moogli" ] && branch=geometry || branch=master; git pull origin $branch; git checkout $branch' +git submodule foreach '[ "$path" = "moogli" ] && branch=geometry || branch=master; git pull origin $branch; git checkout $branch; git pull' -- GitLab