[QGIS Commit] r14094 - in branches/Release-1_5_0/ms-windows: .
osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Aug 16 15:14:05 EDT 2010
Author: jef
Date: 2010-08-16 19:14:05 +0000 (Mon, 16 Aug 2010)
New Revision: 14094
Modified:
branches/Release-1_5_0/ms-windows/QGIS-Installer.nsi
branches/Release-1_5_0/ms-windows/osgeo4w/creatensis.pl
Log:
standalone installer localization and some fixes
Modified: branches/Release-1_5_0/ms-windows/QGIS-Installer.nsi
===================================================================
--- branches/Release-1_5_0/ms-windows/QGIS-Installer.nsi 2010-08-16 15:18:13 UTC (rev 14093)
+++ branches/Release-1_5_0/ms-windows/QGIS-Installer.nsi 2010-08-16 19:14:05 UTC (rev 14094)
@@ -304,6 +304,19 @@
; Language files
!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Dutch"
;----------------------------------------------------------------------------------------------------------------------------
@@ -402,27 +415,11 @@
;Create the Desktop Shortcut
SetShellVarContext current
-!if ${INSTALLER_TYPE} == "OSGeo4W"
- CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!else
- CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!endif
-
;Create the Windows Start Menu Shortcuts
SetShellVarContext all
CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"
-!if ${INSTALLER_TYPE} == "OSGeo4W"
- CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!else
- CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
- "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
-!endif
-
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS Web Site.lnk" "$INSTALL_DIR\QGIS-WebSite.url" ""\
"$INSTALL_DIR\icons\QGIS_Web.ico" "" SW_SHOWNORMAL "" "Visit the Quantum GIS Web Site"
@@ -435,6 +432,26 @@
ReadEnvStr $0 COMSPEC
nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
+
+!if ${INSTALLER_TYPE} == "OSGeo4W"
+ ; Overwrite the shortcuts created by qgis' postinstall
+ ; "%OSGEO4W_STARTMENU%\Quantum GIS (1.5.0).lnk"
+ ; "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.5.0).lnk"
+
+ Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
+ CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+
+ Delete "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk"
+ CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+!else
+ CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+ CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
+ "$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
+!endif
+
SectionEnd
Function DownloadDataSet
@@ -565,6 +582,9 @@
Delete "$INSTDIR\preremove.bat"
Delete "$INSTDIR\preremove.log"
+ Delete "$INSTDIR\QGIS-WebSite.url"
+ Delete "$INSTDIR\*.txt"
+
RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\apps"
RMDir /r "$INSTDIR\etc"
@@ -572,6 +592,7 @@
RMDir /r "$INSTDIR\lib"
RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\icons"
+
!else
;remove files
Delete "$INSTDIR\Uninstall-QGIS.exe"
Modified: branches/Release-1_5_0/ms-windows/osgeo4w/creatensis.pl
===================================================================
--- branches/Release-1_5_0/ms-windows/osgeo4w/creatensis.pl 2010-08-16 15:18:13 UTC (rev 14093)
+++ branches/Release-1_5_0/ms-windows/osgeo4w/creatensis.pl 2010-08-16 19:14:05 UTC (rev 14094)
@@ -18,13 +18,13 @@
my $root = "http://download.osgeo.org/osgeo4w";
-system "wget -q -c http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
-system "wget -q -c http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";
+system "wget -q -Nc http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
+system "wget -q -Nc http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";
my %dep;
my %file;
-system "wget -q -c $root/setup.ini";
+system "wget -q -Nc $root/setup.ini";
open F, "setup.ini" || die "setup.ini not found";
while(<F>) {
chop;
@@ -64,18 +64,26 @@
getDeps("gdal16-mrsid")
}
+my %referenced;
foreach my $p ( keys %pkgs ) {
$f = "$root/$file{$p}";
$f =~ s/\/\.\//\//g;
my($file) = $f =~ /([^\/]+)$/;
+ $referenced{$file} = 1;
next if -f $file;
print "Downloading $file [$f]...\n";
- system "wget -q -c $f";
+ system "wget -q -Nc $f";
}
+for my $p (<*.tar.bz2>) {
+ next if exists $referenced{$p};
+ print "Removing package $p...\n";
+ unlink $p;
+}
+
chdir "..";
#
@@ -84,7 +92,6 @@
# Add addons
#
-
system "rm -rf unpacked" if -d "unpacked" && !grep(/^-k$/, @ARGV);
unless(-d "unpacked") {
@@ -202,7 +209,7 @@
$cmd .= " -DSVN_REVISION='$revision'";
$cmd .= " -DQGIS_BASE='Quantum GIS $release'";
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$major.$minor.$patch-$revision-Setup.exe'";
-$cmd .= " -DDISPLAYED_NAME='Quantum GIS OSGeo4W ($release)'";
+$cmd .= " -DDISPLAYED_NAME='Quantum GIS \'$release\' ($major.$minor.$patch)'";
$cmd .= " -DBINARY_REVISION=1";
$cmd .= " -DINSTALLER_TYPE=OSGeo4W";
$cmd .= " -DPACKAGE_FOLDER=osgeo4w/unpacked";
More information about the QGIS-commit
mailing list