From 7cbdac8fa02faa8770aba10cdf4dbe4af6f3f58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Sun, 8 Feb 2009 13:02:56 +0000 Subject: [PATCH] [Win32] Rename *.bat to *.cmd. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17881 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/Makefile.am | 2 +- packaging/win32/README | 2 +- packaging/win32/dist.sh | 2 +- packaging/win32/gnucash.iss.in | 24 +++++++++---------- ...nstall-fq-mods.bat => install-fq-mods.cmd} | 2 +- packaging/win32/install.sh | 16 ++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) rename packaging/win32/{install-fq-mods.bat => install-fq-mods.cmd} (95%) diff --git a/packaging/win32/Makefile.am b/packaging/win32/Makefile.am index cf93d30abb..e5eb5027c3 100644 --- a/packaging/win32/Makefile.am +++ b/packaging/win32/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = \ 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 \ libgda-3.1.2-patch.diff \ diff --git a/packaging/win32/README b/packaging/win32/README index 28f85ff451..5758316c90 100644 --- a/packaging/win32/README +++ b/packaging/win32/README @@ -76,7 +76,7 @@ These steps need to be performed: 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. diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 7e75b7ed43..9104df8f8f 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -219,7 +219,7 @@ function dist_gnucash() { 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 \ diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index 448daad552..d3771ba9db 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -41,18 +41,18 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm 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 @@ Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program ; 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 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c ; 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 @@ begin 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 ; @@ -202,7 +202,7 @@ begin 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); @@ -255,7 +255,7 @@ IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online 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 diff --git a/packaging/win32/install-fq-mods.bat b/packaging/win32/install-fq-mods.cmd similarity index 95% rename from packaging/win32/install-fq-mods.bat rename to packaging/win32/install-fq-mods.cmd index cbd76c6a25..6bf1775754 100644 --- a/packaging/win32/install-fq-mods.bat +++ b/packaging/win32/install-fq-mods.cmd @@ -4,7 +4,7 @@ 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. + echo Please start this cmd file in the bin directory created by the setup.exe. goto error ) diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index fe0ccf3339..1326b859df 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -1229,14 +1229,14 @@ function make_install() { if [ -z $_skip_scripts ]; then # 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;${LIBDBI_DIR}\\bin;${SQLITE3_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 "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> 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;${LIBDBI_DIR}\\bin;${SQLITE3_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 "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.cmd + echo "start gnucash-bin %*" >> gnucash.cmd qpopd fi }