gnucash-on-windows master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Sep 15 17:00:08 EDT 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/f4124796 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/1e0ce34d (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/74ab1945 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/0ff66de1 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/e67f94d5 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/92295754 (commit)
commit f4124796444f7e550f6053763ab694bab6c8a0cc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 21:32:26 2014 +0200
Change automated build frequency for maint branch
From now on check for changes nightly and rebuild if there was a change.
This is just like the master branch. The weekly restriction was a left over
from the subversion era, where each change in trunk would als trigger a build
in the stable branch. This is no longer the case in git.
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 9b3ad46..26e0ff6 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -8,7 +8,7 @@ cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
-rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
+rem Tags build for 2.6.1 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
-rem maintenance branch build (weekly)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh weekly
\ No newline at end of file
+rem maintenance branch build (daily)
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
\ No newline at end of file
commit 1e0ce34d5a7846903822d3243e60f2987966fbe6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 20:12:19 2014 +0200
Update strawberry perl to latest version
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index d058245..07ceaa0 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -11,7 +11,7 @@ Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
' Set your settings
- strFileURL = "https://strawberry-perl.googlecode.com/files/strawberry-perl-5.18.1.1-32bit.msi"
+ strFileURL = "http://strawberryperl.com/download/5.18.2.2/strawberry-perl-5.18.2.2-32bit.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
commit 74ab194501da7259c1fd01a998c11097e4983666
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 19:48:47 2014 +0200
Avoid > in echo statements
This is interpreted as redirect to file.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index cad7e51..dec3b33 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -104,10 +104,10 @@ echo.
perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
REM echo status = %errorlevel%
if %errorlevel% equ 2 (
- echo => ActivePerl
+ echo - ActivePerl
goto inst_mod_as
) else if %errorlevel% equ 3 (
- echo => Other, probably Strawberry perl ?
+ echo - Other, probably Strawberry perl ?
goto inst_mod_oth
) else if %errorlevel% neq 0 goto error
commit 0ff66de1056e2470283733b955085bb6f2b558dc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 19:47:56 2014 +0200
Use full path to perl right after installation
At this point perl is normally not in the PATH yet.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index 5fb1c0b..cad7e51 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -45,7 +45,7 @@ if %errorlevel% neq 0 (
del %TEMP%\Perl.msi
goto error
)
-perl -v
+%SystemDrive%\strawberry\perl\bin\perl -v
del %TEMP%\Perl.msi
REM ----------------------------------------------------------------------------
commit e67f94d527749816e7f7539764fa49d73eb1359e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Sep 9 23:36:52 2014 +0200
Revert to lower versions of mingwrt and w32api as per mingw recommendations
Attention: you should remove the installed versions of both packages
before rerunning the installer script the next time !
you can do so with these commands in your msys shell:
mingw-get.exe remove mingwrt
mingw-get.exe remove w32api
diff --git a/defaults.sh b/defaults.sh
index 0c42df5..60e1b7f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -106,8 +106,9 @@ set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PEXPORTS_VERSION "0.46"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
-set_default MINGW_RT_VERSION "4.0.3-1"
+set_default MINGW_RT_VERSION "3.20-2"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
+set_default MINGW_W32API_VERSION "3.17-2"
set_default MINGW_MAKE_VERSION "3.82-5"
if [ "$CROSS_COMPILE" != yes ]; then
diff --git a/install-impl.sh b/install-impl.sh
index 1707ef5..8dd16a6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -149,7 +149,7 @@ function inst_mingw() {
# Win32 runtime and api
mingw_smart_get mingw32-mingwrt-dev ${MINGW_RT_VERSION}
- mingw_smart_get mingw32-w32api-dev ${MINGW_RT_VERSION}
+ mingw_smart_get mingw32-w32api-dev ${MINGW_W32API_VERSION}
# GCC/G++ dependencies
mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
mingw_smart_get mingw32-libmpfr-dll ${MINGW_MPFR_VERSION}
Summary of changes:
buildserver/build_periodic.bat | 6 +++---
defaults.sh | 3 ++-
extra_dist/getperl.vbs | 2 +-
extra_dist/install-fq-mods.cmd | 6 +++---
install-impl.sh | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
More information about the gnucash-changes
mailing list