[X2Go-Commits] [buildscripts] 01/01: 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.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit b76f983002d6d04c6adf733d53d3adbea829146a
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Jul 12 09:49:40 2014 -0400

    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.
---
 bin/build-nsis-package.sh |   10 +++++-----
 1 file 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"
 		}

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git