Move the scripts into build-scripts/.

obs/generic/Makefile

@@ -3,23 +3,23 @@ all: build_tree template_stage bootstrap_buildout obs
 clean: clean_build_tree clean_template_stage clean_bootstrap_buildout clean_obs
 
 build_tree:
-	./build_tree.sh
+	build-scripts/build_tree.sh
 clean_build_tree:
-	./clean_build_tree.sh
+	build-scripts/clean_build_tree.sh
 
 template_stage:
-	./template_stage.sh
+	build-scripts/template_stage.sh
 clean_template_stage:
-	./clean_template_stage.sh
+	build-scripts/clean_template_stage.sh
 
 bootstrap_buildout:
-	./bootstrap_buildout.sh
+	build-scripts/bootstrap_buildout.sh
 clean_bootstrap_buildout:
-	./clean_bootstrap_buildout.sh
+	build-scripts/clean_bootstrap_buildout.sh
 
 obs:
-	./obs.sh
+	build-scripts/obs.sh
 clean_obs:
-	./clean_obs.sh
+	build-scripts/clean_obs.sh
 
 .PHONY: all clean build_tree clean_build_tree template_stage clean_template_stage bootstrap_buildout clean_bootstrap_buildout obs clean_obs

obs/generic/bootstrap_buildout.sh → obs/generic/build-scripts/bootstrap_buildout.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 # Download the bootstrap script
@@ -12,5 +12,7 @@ cd $INITIAL_DIR
 # Create a build/bin/buildout (bootstraping) and run it (actual compilation).
 # Note: it creates a lot of things in build/eggs/ and uses software_release/ at some point
 cd $RUN_BUILDOUT_DIR
-cp $TEMPLATE_DIR/tmp/buildout_with_gcc.cfg buildout.cfg
+# should be with gcc here and without in OBS
+cp $TEMPLATE_DIR/tmp/buildout_without_gcc.cfg buildout.cfg
 (python2.7 -S bootstrap-buildout.py --buildout-version 2.7.1+slapos016 --setuptools-version 44.1.1 --setuptools-to-dir eggs -f http://www.nexedi.org/static/packages/source/slapos.buildout/ && ./bin/buildout -v)
+#cp $TEMPLATE_DIR/tmp/buildout_with_gcc.cfg buildout.cfg

obs/generic/build_tree.sh → obs/generic/build-scripts/build_tree.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 mkdir -p tarballs/$SOFTWARE/

obs/generic/clean_bootstrap_buildout.sh → obs/generic/build-scripts/clean_bootstrap_buildout.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 # Remove the bootstrap script and associated files

obs/generic/clean_build_tree.sh → obs/generic/build-scripts/clean_build_tree.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 rm -rf tarballs/$SOFTWARE/

obs/generic/clean_obs.sh → obs/generic/build-scripts/clean_obs.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 TMP_DIR=$INITIAL_DIR/tmp/
 TMP_DIR=`realpath -m $TMP_DIR`

obs/generic/clean_template_stage.sh → obs/generic/build-scripts/clean_template_stage.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 # Clean temporary directory for templates

obs/generic/configuration_information.sh → obs/generic/build-scripts/configuration_information.sh

@@ -2,7 +2,7 @@
 # Use on script as source release_configuration.sh
 ####################################################
 
-INITIAL_DIR="$(pwd)"
+INITIAL_DIR="$(pwd)"/
 # Modify the following variables accordingly
 
 # RELEASE INFORMATION

obs/generic/obs.sh → obs/generic/build-scripts/obs.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 TMP_DIR=$INITIAL_DIR/tmp/
 TMP_DIR=`realpath -m $TMP_DIR`

obs/generic/template_stage.sh → obs/generic/build-scripts/template_stage.sh

 #!/bin/bash
 set -e
 
-source configuration_information.sh
+source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 # Prepare the templates in $TEMPLATE_DIR/tmp/