diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-03-16 12:07:24 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-03-16 12:07:24 -0400 |
| commit | eb964747a7ee2bedced1e10a5069fd8cad410253 (patch) | |
| tree | 13ce8640ea0db088c8d07005b02364a9e7a701f2 | |
| parent | 9a2574dfe69fbf16b19fcbe382c12c4fc9ee2200 (diff) | |
| parent | dc78ce89feb345a19da17b3d17ed7ea45330fd1e (diff) | |
| download | buildscripts-eb964747a7ee2bedced1e10a5069fd8cad410253.tar.gz buildscripts-eb964747a7ee2bedced1e10a5069fd8cad410253.tar.bz2 buildscripts-eb964747a7ee2bedced1e10a5069fd8cad410253.zip | |
Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/buildscripts
| -rw-r--r-- | bin/build-nsis-package.sh | 10 | ||||
| -rwxr-xr-x | bin/build-rpm-package | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 89484ae..40186b5 100644 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -204,11 +204,11 @@ build_packages() { cd $PROJECT_DIR cp -a debian/changelog txt/ - echo "GIT info:" > txt/git-info - git branch >> txt/git-info - echo "=================================" >> txt/git-info - echo "GIT history:" >> txt/git-info - git log -n 10 >> txt/git-info + + # create git changelog immediately prior to building the SRPM package + 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/ nice /cygdrive/d/Build/scripts/nsis-builder.bat --buildresult "D:\\Build\\Scripts\\test\\$l_DIST\\$l_CODENAME\\i386" diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2892100..96886fb 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -171,6 +171,10 @@ build_packages() { git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" cd $TEMP_DIR GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null) + + # create git changelog immediately prior to building the SRPM package + cd $PROJECT && git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog && cd - 1>/dev/null + rm -Rf "$PROJECT/.git" mv $PROJECT/$PROJECT.spec . @@ -201,9 +205,6 @@ build_packages() { mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION - # create git changelog immediately prior to building the SRPM package - git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog - # create the SRPM package rpmbuild -D "%_topdir $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild" -bs $PROJECT.spec |