diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-05-12 23:09:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-05-12 23:15:24 +0200 |
| commit | c815d4c537cb118a4d8067a9243d13af62f8d12b (patch) | |
| tree | d9bb3e21366451672fd8751732970f85caa1998c | |
| parent | 3e206bec6dcc1e2166a457a99b85dbfa7865cfad (diff) | |
| download | buildscripts-c815d4c537cb118a4d8067a9243d13af62f8d12b.tar.gz buildscripts-c815d4c537cb118a4d8067a9243d13af62f8d12b.tar.bz2 buildscripts-c815d4c537cb118a4d8067a9243d13af62f8d12b.zip | |
work on build scripts (packaging vs uploading)
| l--------- | bin/x2go-build+upload-all-packages | 1 | ||||
| l--------- | bin/x2go-build+upload-package | 1 | ||||
| -rwxr-xr-x | bin/x2go-build-all-packages (renamed from bin/x2go-buildallpackages) | 16 | ||||
| -rwxr-xr-x | bin/x2go-build-package (renamed from bin/x2go-buildpackage) | 5 | ||||
| l--------- | bin/x2go-upload-all-packages | 1 | ||||
| l--------- | bin/x2go-upload-package | 1 | ||||
| l--------- | bin/x2go-uploadpackage | 1 |
7 files changed, 21 insertions, 5 deletions
diff --git a/bin/x2go-build+upload-all-packages b/bin/x2go-build+upload-all-packages new file mode 120000 index 0000000..b77cc44 --- /dev/null +++ b/bin/x2go-build+upload-all-packages @@ -0,0 +1 @@ +x2go-build-all-packages
\ No newline at end of file diff --git a/bin/x2go-build+upload-package b/bin/x2go-build+upload-package new file mode 120000 index 0000000..b6ef03d --- /dev/null +++ b/bin/x2go-build+upload-package @@ -0,0 +1 @@ +x2go-build-package
\ No newline at end of file diff --git a/bin/x2go-buildallpackages b/bin/x2go-build-all-packages index cb877bf..815b7de 100755 --- a/bin/x2go-buildallpackages +++ b/bin/x2go-build-all-packages @@ -58,13 +58,25 @@ COMPONENT=${1:-""} # build the newest code... (nightly-builds) [ "x$COMPONENT" = "xheuler" ] || [ -z $COMPONENT ] && { echo -e $LIB_PACKAGES_HEULER + $APP_PACKAGES_HEULER | while read pkg comp checkout; do - x2go-buildpackage $pkg $comp $checkout && x2go-packageupload $pkg $comp $checkout + if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then + x2go-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then + x2go-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xx2go-build+upload-all-packages" ]; then + x2go-build-package $pkg $comp $checkout && x2go-upload-package $pkg $comp $checkout + fi done } # build all packages tagged as ,,build-main'Ä [ "x$COMPONENT" = "xmain" ] || [ -z $COMPONENT ] && { echo -e $LIB_PACKAGES_MAIN + $APP_PACKAGES_MAIN | while read pkg comp checkout; do - x2go-buildpackage $pkg $comp $checkout && x2go-packageupload $pkg $comp $checkout + if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then + x2go-build-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then + x2go-upload-package $pkg $comp $checkout + elif [ "x$(basename $0)" = "xx2go-build+upload-all-packages" ]; then + x2go-build-package $pkg $comp $checkout && x2go-upload-package $pkg $comp $checkout + fi done } diff --git a/bin/x2go-buildpackage b/bin/x2go-build-package index 23cf0e8..8883a2e 100755 --- a/bin/x2go-buildpackage +++ b/bin/x2go-build-package @@ -182,14 +182,15 @@ upload_packages() { ### MAIN ### set_vars $@ && { - if ["x$(basename $0)" = "xx2go-buildpackage" ]; then + if [ "x$(basename $0)" = "xx2go-build-package" ]; then cd $PROJECT_DIR && x2go-pkgneedsbuild $CHECKOUT && { clear_pkgdist prepare_workspace && { build_packages } } - elif ["x$(basename $0)" = "xx2go-uploadpackage" ]; then + fi + if [ "x$(basename $0)" = "xx2go-upload-package" ] || [ "x$(basename $0)" = "xx2go-build+upload-package" ]; then upload_packages fi } diff --git a/bin/x2go-upload-all-packages b/bin/x2go-upload-all-packages new file mode 120000 index 0000000..b77cc44 --- /dev/null +++ b/bin/x2go-upload-all-packages @@ -0,0 +1 @@ +x2go-build-all-packages
\ No newline at end of file diff --git a/bin/x2go-upload-package b/bin/x2go-upload-package new file mode 120000 index 0000000..b6ef03d --- /dev/null +++ b/bin/x2go-upload-package @@ -0,0 +1 @@ +x2go-build-package
\ No newline at end of file diff --git a/bin/x2go-uploadpackage b/bin/x2go-uploadpackage deleted file mode 120000 index 18eb486..0000000 --- a/bin/x2go-uploadpackage +++ /dev/null @@ -1 +0,0 @@ -x2go-buildpackage
\ No newline at end of file |