r17907 - gnucash/branches/2.2/packaging/win32 - [17881] [Win32] Rename *.bat to *.cmd.
Andreas Köhler
andi5 at cvs.gnucash.org
Sat Feb 14 16:11:42 EST 2009
Author: andi5
Date: 2009-02-14 16:11:42 -0500 (Sat, 14 Feb 2009)
New Revision: 17907
Trac: http://svn.gnucash.org/trac/changeset/17907
Added:
gnucash/branches/2.2/packaging/win32/install-fq-mods.cmd
Removed:
gnucash/branches/2.2/packaging/win32/install-fq-mods.bat
Modified:
gnucash/branches/2.2/packaging/win32/Makefile.am
gnucash/branches/2.2/packaging/win32/README
gnucash/branches/2.2/packaging/win32/dist.sh
gnucash/branches/2.2/packaging/win32/gnucash.iss.in
gnucash/branches/2.2/packaging/win32/install.sh
Log:
[17881] [Win32] Rename *.bat to *.cmd.
Modified: gnucash/branches/2.2/packaging/win32/Makefile.am
===================================================================
--- gnucash/branches/2.2/packaging/win32/Makefile.am 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/Makefile.am 2009-02-14 21:11:42 UTC (rev 17907)
@@ -6,7 +6,7 @@
functions.sh \
goffice-0.4.3-patch.diff \
install.sh \
- install-fq-mods.bat \
+ install-fq-mods.cmd \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
pi.sh \
Modified: gnucash/branches/2.2/packaging/win32/README
===================================================================
--- gnucash/branches/2.2/packaging/win32/README 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/README 2009-02-14 21:11:42 UTC (rev 17907)
@@ -76,7 +76,7 @@
5. The content of $GNUCASH_DIR (as well as all the other binary
packages) should then be copied to a windows machine. The paths
- in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.bat
+ in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.cmd
need to be adjusted for the installation location on the
windows machine.
Modified: gnucash/branches/2.2/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/2.2/packaging/win32/dist.sh 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/dist.sh 2009-02-14 21:11:42 UTC (rev 17907)
@@ -180,7 +180,7 @@
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
+ cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
_QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
Modified: gnucash/branches/2.2/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/branches/2.2/packaging/win32/gnucash.iss.in 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/gnucash.iss.in 2009-02-14 21:11:42 UTC (rev 17907)
@@ -41,18 +41,18 @@
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
-Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
[Run]
-Filename: "{app}\bin\gnucash.bat"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
-Filename: "{app}\bin\guile.bat"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
+Filename: "{app}\bin\gnucash.cmd"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
@@ -70,7 +70,7 @@
; The main executables and DLLs
Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
; Note: The above AfterInstall function will create the
-; gnucash.bat file on-the-fly by the Pascal script below.
+; gnucash.cmd file on-the-fly by the Pascal script below.
Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
@@ -145,8 +145,8 @@
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\gnucash.bat"
-Type: files; Name: "{app}\bin\guile.bat"
+Type: files; Name: "{app}\bin\gnucash.cmd"
+Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
Type: filesandordirs; Name: "{app}\share\guile"
Type: filesandordirs; Name: "{app}\etc\gconf"
@@ -183,8 +183,8 @@
pkglibdir := libdir + '\gnucash';
pkgdatadir := appdir + '\share\gnucash';
- { Create the gnucash.bat file; #10 is the linefeed character and #13 CR }
- FileName := appdir + '\bin\gnucash.bat' ;
+ { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+ FileName := appdir + '\bin\gnucash.cmd' ;
FileString := 'setlocal'#13#10 ;
FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
@@ -201,7 +201,7 @@
if Res = False then
MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
- FileName := appdir + '\bin\guile.bat' ;
+ FileName := appdir + '\bin\guile.cmd' ;
FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
Res := SaveStringToFile(FileName, FileString, False);
@@ -254,7 +254,7 @@
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-;; List of Code pages, used in gnucash.bat
+;; List of Code pages, used in gnucash.cmd
LanguageCodePage=1252
de.LanguageCodePage=1252
el.LanguageCodePage=1253
Deleted: gnucash/branches/2.2/packaging/win32/install-fq-mods.bat
===================================================================
--- gnucash/branches/2.2/packaging/win32/install-fq-mods.bat 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/install-fq-mods.bat 2009-02-14 21:11:42 UTC (rev 17907)
@@ -1,92 +0,0 @@
- at echo off
-setlocal
-
-if not exist ssleay32.dll (
- echo.
- echo Did not find ssleay32.dll in current directory.
- echo Please start this batch file in the bin directory created by the setup.exe.
- goto error
-)
-
-echo.
-echo * Check Perl
-echo.
-perl -e "exit(int($]));"
-set _perlmajor=%errorlevel%
-perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
-set _perlminor=%errorlevel%
-if %_perlmajor% equ 5 (
- if %_perlminor% equ 10 (
- set _perlversion=5.10
- goto ccp
- )
- if %_perlminor% equ 8 (
- set _perlversion=5.8
- goto ccp
- )
- if %_perlminor% equ 6 (
- set _perlversion=5.6
- goto ccp
- )
-)
-echo.
-echo Did not find a usable perl.
-echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl)
-echo and add the bin directory to your Path environment variable.
-goto error
-:ccp
-
-echo * Install DateManip
-echo.
-perl -x -S ppm install Date-Manip
-if %errorlevel% neq 0 (
- perl -x -S ppm install DateManip
- if %errorlevel% neq 0 goto error
-)
-
-echo.
-echo * Install Crypt-SSLeay
-echo.
-set OLDPATH=%PATH%
-set PATH=%CD%;%PATH%
-if %_perlversion% == 5.10 (
- perl -x -S ppm install Crypt-SSLeay
-) else if %_perlversion% == 5.8 (
- echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
-) else (
- perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
-)
-set errlvlbak=%errorlevel%
-set PATH=%OLDPATH%
-if %errlvlbak% neq 0 goto error
-
-echo.
-echo * Install Finance-Quote
-echo.
-perl -x -S ppm install Finance-Quote
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Run gnc-fq-check
-echo.
-perl -w gnc-fq-check
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Run gnc-fq-helper
-echo.
-echo (yahoo "AMZN") | perl -w gnc-fq-helper
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Installation succeeded
-echo.
-goto end
-
-:error:
-echo.
-echo An error occured, see above.
-echo.
-
-:end
-pause
Copied: gnucash/branches/2.2/packaging/win32/install-fq-mods.cmd (from rev 17906, gnucash/branches/2.2/packaging/win32/install-fq-mods.bat)
===================================================================
--- gnucash/branches/2.2/packaging/win32/install-fq-mods.cmd (rev 0)
+++ gnucash/branches/2.2/packaging/win32/install-fq-mods.cmd 2009-02-14 21:11:42 UTC (rev 17907)
@@ -0,0 +1,92 @@
+ at echo off
+setlocal
+
+if not exist ssleay32.dll (
+ echo.
+ echo Did not find ssleay32.dll in current directory.
+ echo Please start this cmd file in the bin directory created by the setup.exe.
+ goto error
+)
+
+echo.
+echo * Check Perl
+echo.
+perl -e "exit(int($]));"
+set _perlmajor=%errorlevel%
+perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
+set _perlminor=%errorlevel%
+if %_perlmajor% equ 5 (
+ if %_perlminor% equ 10 (
+ set _perlversion=5.10
+ goto ccp
+ )
+ if %_perlminor% equ 8 (
+ set _perlversion=5.8
+ goto ccp
+ )
+ if %_perlminor% equ 6 (
+ set _perlversion=5.6
+ goto ccp
+ )
+)
+echo.
+echo Did not find a usable perl.
+echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl)
+echo and add the bin directory to your Path environment variable.
+goto error
+:ccp
+
+echo * Install DateManip
+echo.
+perl -x -S ppm install Date-Manip
+if %errorlevel% neq 0 (
+ perl -x -S ppm install DateManip
+ if %errorlevel% neq 0 goto error
+)
+
+echo.
+echo * Install Crypt-SSLeay
+echo.
+set OLDPATH=%PATH%
+set PATH=%CD%;%PATH%
+if %_perlversion% == 5.10 (
+ perl -x -S ppm install Crypt-SSLeay
+) else if %_perlversion% == 5.8 (
+ echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
+) else (
+ perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
+)
+set errlvlbak=%errorlevel%
+set PATH=%OLDPATH%
+if %errlvlbak% neq 0 goto error
+
+echo.
+echo * Install Finance-Quote
+echo.
+perl -x -S ppm install Finance-Quote
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Run gnc-fq-check
+echo.
+perl -w gnc-fq-check
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Run gnc-fq-helper
+echo.
+echo (yahoo "AMZN") | perl -w gnc-fq-helper
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Installation succeeded
+echo.
+goto end
+
+:error:
+echo.
+echo An error occured, see above.
+echo.
+
+:end
+pause
Modified: gnucash/branches/2.2/packaging/win32/install.sh
===================================================================
--- gnucash/branches/2.2/packaging/win32/install.sh 2009-02-14 21:11:34 UTC (rev 17906)
+++ gnucash/branches/2.2/packaging/win32/install.sh 2009-02-14 21:11:42 UTC (rev 17907)
@@ -1025,13 +1025,13 @@
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
- echo "setlocal" > gnucash.bat
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" >> gnucash.bat
- echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
- echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
- echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat
- echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
- echo "start gnucash-bin %*" >> gnucash.bat
+ echo "setlocal" > gnucash.cmd
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" >> gnucash.cmd
+ echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
+ echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
+ echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
+ echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.cmd
+ echo "start gnucash-bin %*" >> gnucash.cmd
qpopd
}
More information about the gnucash-changes
mailing list