Skip to content

Commit ff0c888

Browse files
author
jef
committedAug 16, 2010
standalone installer localization and some fixes
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_5_0@14094 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ab93815 commit ff0c888

File tree

2 files changed

+50
-22
lines changed

2 files changed

+50
-22
lines changed
 

‎ms-windows/QGIS-Installer.nsi

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,19 @@ FunctionEnd
304304

305305
; Language files
306306
!insertmacro MUI_LANGUAGE "English"
307+
!insertmacro MUI_LANGUAGE "German"
308+
!insertmacro MUI_LANGUAGE "French"
309+
!insertmacro MUI_LANGUAGE "Russian"
310+
!insertmacro MUI_LANGUAGE "Japanese"
311+
!insertmacro MUI_LANGUAGE "Italian"
312+
!insertmacro MUI_LANGUAGE "Polish"
313+
!insertmacro MUI_LANGUAGE "Spanish"
314+
!insertmacro MUI_LANGUAGE "PortugueseBR"
315+
!insertmacro MUI_LANGUAGE "Portuguese"
316+
!insertmacro MUI_LANGUAGE "Czech"
317+
!insertmacro MUI_LANGUAGE "Croatian"
318+
!insertmacro MUI_LANGUAGE "Thai"
319+
!insertmacro MUI_LANGUAGE "Dutch"
307320

308321
;----------------------------------------------------------------------------------------------------------------------------
309322

@@ -402,27 +415,11 @@ Section "Quantum GIS" SecQGIS
402415
;Create the Desktop Shortcut
403416
SetShellVarContext current
404417

405-
!if ${INSTALLER_TYPE} == "OSGeo4W"
406-
CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
407-
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
408-
!else
409-
CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
410-
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
411-
!endif
412-
413418
;Create the Windows Start Menu Shortcuts
414419
SetShellVarContext all
415420

416421
CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"
417422

418-
!if ${INSTALLER_TYPE} == "OSGeo4W"
419-
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
420-
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
421-
!else
422-
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
423-
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
424-
!endif
425-
426423
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS Web Site.lnk" "$INSTALL_DIR\QGIS-WebSite.url" ""\
427424
"$INSTALL_DIR\icons\QGIS_Web.ico" "" SW_SHOWNORMAL "" "Visit the Quantum GIS Web Site"
428425

@@ -435,6 +432,26 @@ Section "Quantum GIS" SecQGIS
435432

436433
ReadEnvStr $0 COMSPEC
437434
nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
435+
436+
!if ${INSTALLER_TYPE} == "OSGeo4W"
437+
; Overwrite the shortcuts created by qgis' postinstall
438+
; "%OSGEO4W_STARTMENU%\Quantum GIS (1.5.0).lnk"
439+
; "%ALLUSERSPROFILE%\Desktop\Quantum GIS (1.5.0).lnk"
440+
441+
Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
442+
CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
443+
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
444+
445+
Delete "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk"
446+
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
447+
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
448+
!else
449+
CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
450+
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
451+
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
452+
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
453+
!endif
454+
438455
SectionEnd
439456

440457
Function DownloadDataSet
@@ -565,13 +582,17 @@ Section "Uninstall"
565582
Delete "$INSTDIR\preremove.bat"
566583
Delete "$INSTDIR\preremove.log"
567584

585+
Delete "$INSTDIR\QGIS-WebSite.url"
586+
Delete "$INSTDIR\*.txt"
587+
568588
RMDir /r "$INSTDIR\bin"
569589
RMDir /r "$INSTDIR\apps"
570590
RMDir /r "$INSTDIR\etc"
571591
RMDir /r "$INSTDIR\include"
572592
RMDir /r "$INSTDIR\lib"
573593
RMDir /r "$INSTDIR\share"
574594
RMDir /r "$INSTDIR\icons"
595+
575596
!else
576597
;remove files
577598
Delete "$INSTDIR\Uninstall-QGIS.exe"

‎ms-windows/osgeo4w/creatensis.pl

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
my $root = "http://download.osgeo.org/osgeo4w";
2020

21-
system "wget -q -c http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
22-
system "wget -q -c http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";
21+
system "wget -q -Nc http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip" unless -f "Untgz.zip";
22+
system "wget -q -Nc http://www.nirsoft.net/utils/nircmd.zip" unless -f "nircmd.zip";
2323

2424
my %dep;
2525
my %file;
2626

27-
system "wget -q -c $root/setup.ini";
27+
system "wget -q -Nc $root/setup.ini";
2828
open F, "setup.ini" || die "setup.ini not found";
2929
while(<F>) {
3030
chop;
@@ -64,16 +64,24 @@ sub getDeps {
6464
getDeps("gdal16-mrsid")
6565
}
6666

67+
my %referenced;
6768
foreach my $p ( keys %pkgs ) {
6869
$f = "$root/$file{$p}";
6970
$f =~ s/\/\.\//\//g;
7071

7172
my($file) = $f =~ /([^\/]+)$/;
73+
$referenced{$file} = 1;
7274

7375
next if -f $file;
7476

7577
print "Downloading $file [$f]...\n";
76-
system "wget -q -c $f";
78+
system "wget -q -Nc $f";
79+
}
80+
81+
for my $p (<*.tar.bz2>) {
82+
next if exists $referenced{$p};
83+
print "Removing package $p...\n";
84+
unlink $p;
7785
}
7886

7987
chdir "..";
@@ -84,7 +92,6 @@ sub getDeps {
8492
# Add addons
8593
#
8694

87-
8895
system "rm -rf unpacked" if -d "unpacked" && !grep(/^-k$/, @ARGV);
8996

9097
unless(-d "unpacked") {
@@ -202,7 +209,7 @@ sub getDeps {
202209
$cmd .= " -DSVN_REVISION='$revision'";
203210
$cmd .= " -DQGIS_BASE='Quantum GIS $release'";
204211
$cmd .= " -DINSTALLER_NAME='QGIS-OSGeo4W-$major.$minor.$patch-$revision-Setup.exe'";
205-
$cmd .= " -DDISPLAYED_NAME='Quantum GIS OSGeo4W ($release)'";
212+
$cmd .= " -DDISPLAYED_NAME='Quantum GIS \'$release\' ($major.$minor.$patch)'";
206213
$cmd .= " -DBINARY_REVISION=1";
207214
$cmd .= " -DINSTALLER_TYPE=OSGeo4W";
208215
$cmd .= " -DPACKAGE_FOLDER=osgeo4w/unpacked";

0 commit comments

Comments
 (0)
Please sign in to comment.