Skip to content

Commit

Permalink
build: Add version checking.
Browse files Browse the repository at this point in the history
Previously if there was a newer version to be used, the build system
would not be able to detect that.

With the current system, a newer version, requires the setting of the
$BUILD_VARIABLE in the scripts/get_build.sh script, and it will fetch
the new version.

Signed-off-by: Bart Kuivenhoven <bemkuivenhoven@gmail.com>
  • Loading branch information
bemk committed Sep 23, 2014
1 parent c2af6bf commit 48dd4e2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -7,7 +7,7 @@ config
*~
bin/
src/scripts/floppy.img
scripts/build
scripts/build*
/nbproject/
*.kate-swp
*.swp
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -13,7 +13,7 @@ MAKE=make

.PHONY: all clean preconfigure configure distclean test doxygen
.PHONY: bin/andromeda.img allyes-config allno-config random-config
.PHONY: bin/andromeda.iso test_iso bin test_gdb test_iso_gdb
.PHONY: bin/andromeda.iso test_iso bin test_gdb test_iso_gdb scripts/build
@$(MAKE) -C src/ clean

all: bin/doxygen.tar.bz2 bin/andromeda.iso
Expand Down Expand Up @@ -45,7 +45,7 @@ scripts/build:
scripts/get_build.sh

distclean: clean
rm -fv scripts/build
rm -fv scripts/build*
rm -fv .config
rm -rfv bin/
rm -rfv doc/doxygen
Expand Down
Binary file added scripts/build-0.2
Binary file not shown.
12 changes: 9 additions & 3 deletions scripts/get_build.sh
@@ -1,5 +1,11 @@
#!/bin/bash
if [ ! -f scripts/build ]; then
wget http://ci.orion-os.eu/job/Build-0.2/lastSuccessfulBuild/artifact/build -O scripts/build;
chmod +x scripts/build
echo "Fetching build system"
BUILD_VERSION=-0.2
if [ ! -f scripts/build$BUILD_VERSION ]; then
wget http://ci.orion-os.eu/job/Build$BUILD_VERSION/lastSuccessfulBuild/artifact/build -O scripts/build$BUILD_VERSION;
if [ -f scripts/build ]; then
rm scripts/build
fi
ln -sv build$BUILD_VERSION scripts/build
chmod +x scripts/build$BUILD_VERSION
fi

0 comments on commit 48dd4e2

Please sign in to comment.