Bug 339070 - Shortcuts not created with standard and complete installs. r=bsmedberg

browser/installer/windows/nsis/instfiles-extra.nsi

@@ -21,39 +21,19 @@
   ${EndUnless}
   ClearErrors
 
-# With current versions of flashplayer the location of the plugin is found via
-# the registry so the following has been commented out since it should no longer
-# be necessary.
-  ; Check if Netscape Navigator (pre 6.0) is installed and if the
-  ; flash player is installed in Netscape's plugin folder. If it is,
-  ; try to copy the flashplayer.xpt file into our plugins folder to
-  ; make ensure that flash is scriptable if we're using it from
-  ; Netscape's plugins folder.
-/*
-  StrCpy $TmpVal "Software\Netscape\Netscape Navigator"
-  ReadRegStr $0 HKLM $TmpVal "CurrentVersion"
-  ${Unless} ${Errors}
-    StrCpy $TmpVal "$TmpVal\$0\Main"
-    ReadRegStr $0 HKLM $TmpVal "Plugins Directory"
-    ${Unless} ${Errors}
-      GetFullPathName $TmpVal $0
-      ${Unless} ${Errors}
-        StrCpy $1 $TmpVal "" -1
-        ${If} $1 == "\"
-          StrCpy $TmpVal "$TmpVal" -1
-        ${EndIf}
-        GetFullPathName $TmpVal "$TmpVal\flashplayer.xpt"
-        ${Unless} ${Errors}
-          CopyFiles /SILENT $TmpVal "$INSTDIR\plugins"
-          ${LogUninstall} "\plugins\flashplayer.xpt"
-          ${If} ${Errors}
-            ${LogMsg} "** ERROR Copying File: $TmpVal **"
-          ${Else}
-            ${LogMsg} "Source     : $TmpVal"
-            ${LogMsg} "Destination: $INSTDIR\plugins\flashplayer.xpt"
-          ${EndIf}
-        ${EndUnless}
-      ${EndUnless}
-    ${EndUnless}
-  ${EndUnless}
-*/
+  ; Default for creating Start Menu folder and shortcuts
+  ; (1 = create, 0 = don't create)
+  ${If} $AddStartMenuSC == ""
+    StrCpy $AddStartMenuSC "1"
+  ${EndIf}
+
+  ; Default for creating Quick Launch shortcut (1 = create, 0 = don't create)
+  ${If} $AddQuickLaunchSC == ""
+    StrCpy $AddQuickLaunchSC "1"
+  ${EndIf}
+
+  ; Default for creating Desktop shortcut (1 = create, 0 = don't create)
+  ${If} $AddDesktopSC == ""
+    StrCpy $AddDesktopSC "1"
+  ${EndIf}
+

toolkit/mozapps/installer/windows/nsis/installer.nsi

@@ -435,6 +435,8 @@ Section "Application" Section1
   ; will be removed when the application is uninstalled. To remove an empty
   ; directory write a bogus filename to the deepest directory and all empty
   ; parent directories will be removed.
+  ${LogUninstall} "File: \components\compreg.dat"
+  ${LogUninstall} "File: \components\xpti.dat"
   ${LogUninstall} "File: \.autoreg"
   ${LogUninstall} "File: \active-update.xml"
   ${LogUninstall} "File: \install.log"
@@ -701,6 +703,7 @@ Section "Uninstall"
     ; Remove directories we always control
     RmDir /r "$INSTDIR\uninstall"
     RmDir /r "$INSTDIR\updates"
+    RmDir /r "$INSTDIR\defaults\shortcuts"
 
     ; Remove empty directories
     ${un.LineFind} "$TmpVal" "/NUL" "1:-1" "un.RemoveDirsCallback"