diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 00:45:44 +0300 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 00:45:44 +0300 |
| commit | d0741a02b703b9f5e53c527b04593699d37751fc (patch) | |
| tree | ae8d0623901dc22cd05d0824d2901faa4bd73201 /package.sh | |
| parent | 9d3afc7ff37410191357598a442b030fc9296bc3 (diff) | |
| parent | 1e366958826e05e140cf7624dfc42f3853cca189 (diff) | |
Merge tag '15.01-RC6' into upstream
Conflicts:
Cura/gui/simpleMode.py
Cura/util/profile.py
Cura/util/resources.py
Cura/util/sliceEngine.py
scripts/linux/debian_control
scripts/linux/debian_i386/DEBIAN/control
Diffstat (limited to 'package.sh')
| -rwxr-xr-x | package.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package.sh b/package.sh index b647b3e7cc..7330f7ac6e 100755 --- a/package.sh +++ b/package.sh @@ -19,7 +19,7 @@ BUILD_TARGET=${1:-none} ##Do we need to create the final archive ARCHIVE_FOR_DISTRIBUTION=1 ##Which version name are we appending to the final archive -export BUILD_NAME=15.01-RC5 +export BUILD_NAME=15.01-RC6 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET} ##Revision @@ -298,6 +298,7 @@ if [ "$BUILD_TARGET" = "debian_i386" ]; then cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/ cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/ echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version + cat scripts/linux/debian_control | sed "s/\[BUILD_NAME\]/${BUILD_NAME}/" | sed 's/\[ARCH\]/i386/' > scripts/linux/${BUILD_TARGET}/DEBIAN/control sudo chown root:root scripts/linux/${BUILD_TARGET} -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R @@ -327,6 +328,7 @@ if [ "$BUILD_TARGET" = "debian_amd64" ]; then cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/ cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/ echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version + cat scripts/linux/debian_control | sed "s/\[BUILD_NAME\]/${BUILD_NAME}/" | sed 's/\[ARCH\]/amd64/' > scripts/linux/${BUILD_TARGET}/DEBIAN/control sudo chown root:root scripts/linux/${BUILD_TARGET} -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R @@ -356,6 +358,7 @@ if [ "$BUILD_TARGET" = "debian_armhf" ]; then cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/ cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/ echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version + cat scripts/linux/debian_control | sed "s/\[BUILD_NAME\]/${BUILD_NAME}/" | sed 's/\[ARCH\]/armhf/' > scripts/linux/${BUILD_TARGET}/DEBIAN/control sudo chown root:root scripts/linux/${BUILD_TARGET} -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R @@ -473,8 +476,6 @@ if [ $BUILD_TARGET = "win32" ]; then cp /usr/lib/gcc/i686-w64-mingw32/4.8/libgcc_s_sjlj-1.dll $TARGET_DIR cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll $TARGET_DIR cp /usr/lib/gcc/i686-w64-mingw32/4.8/libstdc++-6.dll $TARGET_DIR -else - cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/ fi #package the result |