diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2014-07-12 09:49:40 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2014-07-12 09:49:40 -0400 |
commit | b76f983002d6d04c6adf733d53d3adbea829146a (patch) | |
tree | 69be565fe1de1c69851f2e93f9855c35a8309304 | |
parent | 8ffc5693120e55662664bdbab547169204ee9bc8 (diff) | |
download | buildscripts-b76f983002d6d04c6adf733d53d3adbea829146a.tar.gz buildscripts-b76f983002d6d04c6adf733d53d3adbea829146a.tar.bz2 buildscripts-b76f983002d6d04c6adf733d53d3adbea829146a.zip |
Run Windows build scripts directly from buildscripts.git. This is OK as long as the .sh scripts are called from cygwin bash and, and pulled using cygwin git, which do handle symlinks.
-rw-r--r-- | bin/build-nsis-package.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index ae7ef59..66764f3 100644 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -21,9 +21,9 @@ # rough around the edges. For example, many lines are commented out # and many values are hardcoded. # It needs to be run under cygwin. -# It also needs to be placed under /cygdrive/d/Build/scripts/ +# It also needs to be placed under /cygdrive/d/Build/buildscripts.git/bin/ -export PATH=~/bin:/cygdrive/d/Build/scripts:$PATH +export PATH=~/bin:/cygdrive/d/Build/buildscripts.git/bin:$PATH GIT_USER="x2go" GIT_HOSTNAME="code.x2go.org" @@ -199,7 +199,7 @@ build_packages() { l_CODENAME=qt-4.8 # TODO: Improve generate-nsis-version.pl so that it can be run from another dir - cd /cygdrive/d/Build/scripts/ + cd /cygdrive/d/Build/buildscripts.git/bin/ ./generate-nsis-version.pl cd $PROJECT_DIR @@ -209,9 +209,9 @@ build_packages() { git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog cp ChangeLog.gitlog txt/git-info - cd /cygdrive/d/Build/scripts/ + cd /cygdrive/d/Build/buildscripts.git/bin/ - nice /cygdrive/d/Build/scripts/nsis-builder.bat --buildresult "D:\\Build\\Scripts\\test\\$l_DIST\\$l_CODENAME\\i386" + nice /cygdrive/d/Build/buildscripts.git/bin/nsis-builder.bat --buildresult "D:\\Build\\Scripts\\test\\$l_DIST\\$l_CODENAME\\i386" rm -Rf "$TEMP_DIR" } |