Merge branch 'arc-4.8-dev' into arc-releases

Author: anthony-kolesov

ChangeLog

@@ -1,3 +1,7 @@
+2014-12-08  Anton Kolesov  <[email protected]>
+
+	* arc-versions.sh: Change Linux version to 3.13.
+
 2014-12-04  Anton Kolesov  <[email protected]>
 
 	* Synopsys_FOSS_Notices.pdf: New file.

arc-versions.sh

@@ -85,7 +85,7 @@ uclibc="uClibc:arc-2014.12-rc2"
 
 if [ "x${uclibc_arg}" = "x--uclibc" ]
 then
-    linux="linux:arc-3.15"
+    linux="linux:arc-3.13"
 else
     linux=""
 fi

windows-installer/build-installer.sh

@@ -48,11 +48,11 @@ cp ../tars/arcshell.bat .
 
 # Copy OpenOCD
 echo "Copying OpenOCD..."
-tar xaf ../tars/openocd-ide-*.tgz --strip-components=1
+tar xaf ../tars/openocd-*.tar.gz --strip-components=1
 
 # Copy tool chain
 echo "Copything toolchain..."
-tar xaf ../tars/arc_gnu_*_prebuilt_elf32_windows_install.tgz --strip-components=1
+tar xaf ../tars/arc_gnu_*_prebuilt_elf32_windows_install.tar.gz --strip-components=1
 
 # Copy Eclipse
 echo "Copying Eclipse..."

windows-installer/setup-base.nsi

@@ -99,11 +99,11 @@ FunctionEnd
     ; http://nsis.sourceforge.net/Docs/AppendixG.html  (to build yourself)
     ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
     SetShellVarContext all
+    CreateShortCut "$DESKTOP\${arctitle} ${arcver} Eclipse.lnk" "$INSTDIR\eclipse\eclipse.exe" "" "$INSTDIR\eclipse\eclipse.exe" 0
     CreateDirectory "$SMPROGRAMS\${shelldir}"
     CreateShortCut "$SMPROGRAMS\${shelldir}\${arctitle} ${arcver} Command Prompt.lnk" '%comspec%' '/k "$INSTDIR\arcshell.bat"'
-    CreateShortCut "$DESKTOP\${arctitle} ${arcver} Eclipse.lnk" "$INSTDIR\eclipse\eclipse.exe" "" "$INSTDIR\eclipse\eclipse.exe" 0
     CreateShortCut "$SMPROGRAMS\${shelldir}\${arctitle} ${arcver} Eclipse.lnk" "$INSTDIR\eclipse\eclipse.exe" "" "$INSTDIR\eclipse\eclipse.exe" 0
-    CreateShortCut "$SMPROGRAMS\${shelldir}\Uninstall ${arctitle} ${arcver}.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+    CreateShortCut "$SMPROGRAMS\${shelldir}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
     CreateShortCut "$SMPROGRAMS\${shelldir}\Documentation.lnk" "$INSTDIR\share\doc" 0
     CreateShortCut "$SMPROGRAMS\${shelldir}\IDE Wiki on GitHub.lnk" \
       "https://github.com/foss-for-synopsys-dwc-arc-processors/arc_gnu_eclipse/wiki" 0
@@ -117,10 +117,13 @@ FunctionEnd
   section "Uninstall"
     SetShellVarContext all
     Delete "$DESKTOP\${arctitle} ${arcver} Eclipse.lnk"
-    Delete "$SMPROGRAMS\${arctitle}\${arctitle} ${arcver} Eclipse.lnk"
-    Delete "$SMPROGRAMS\${arctitle}\${arctitle} ${arcver} Command Prompt.lnk"
-    Delete "$SMPROGRAMS\${arctitle}\Uninstall ${arctitle} ${arcver}.lnk"
-    RmDir "$SMPROGRAMS\${arctitle}"
+	Delete "$SMPROGRAMS\${shelldir}\${arctitle} ${arcver} Command Prompt.lnk"
+	Delete "$SMPROGRAMS\${shelldir}\${arctitle} ${arcver} Eclipse.lnk"
+    Delete "$SMPROGRAMS\${shelldir}\Uninstall.lnk"
+	Delete "$SMPROGRAMS\${shelldir}\Documentation.lnk"
+	Delete "$SMPROGRAMS\${shelldir}\IDE Wiki on GitHub.lnk"
+	Delete "$SMPROGRAMS\${shelldir}\IDE Releases on GitHub.lnk"
+    RmDir "$SMPROGRAMS\${shelldir}"
     ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin"
     !include "uninstall_files.nsi"
     Delete "$INSTDIR\Uninstall.exe"