Menu
▾
▴
[Xlw-cvs] SF.net SVN: xlw:[1381] trunk/xlw/MinGW_Installer
|
From: <ad...@us...> - 2012-01-09 13:21:52
|
Revision: 1381
http://xlw.svn.sourceforge.net/xlw/?rev=1381&view=rev
Author: adcockj
Date: 2012-01-09 13:21:42 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Fix paths in mingw installer as sf seem to have disabled old project file paths and mingw have renamed some as well
Modified Paths:
--------------
trunk/xlw/MinGW_Installer/MinGW-Installer.nsi
trunk/xlw/MinGW_Installer/mingwFileList.nsh
Modified: trunk/xlw/MinGW_Installer/MinGW-Installer.nsi
===================================================================
--- trunk/xlw/MinGW_Installer/MinGW-Installer.nsi 2011-12-19 13:06:56 UTC (rev 1380)
+++ trunk/xlw/MinGW_Installer/MinGW-Installer.nsi 2012-01-09 13:21:42 UTC (rev 1381)
@@ -90,26 +90,24 @@
untgz::extract -d "$INSTDIR\MinGW" "$INSTDIR\Download\$Mirror\${DLFile}"
!macroend
+
+ Var Dialog
+ Var Label
+ Var DropList
+ Var Mirror
+
+
!macro Download DLFile DLDir
- NSISdl::download "http://downloads.sourceforge.net/project/mingw/${DLDir}/${DLFile}?use_mirror=$Mirror" "$INSTDIR\Download\$Mirror\${DLFile}"
- DetailPrint "Downloading ${DLFile}"
+ NSISdl::download "http://sourceforge.net/projects/mingw/files/${DLDir}/${DLFile}/download?use_mirror=$Mirror" "$INSTDIR\Download\$Mirror\${DLFile}"
+ DetailPrint "Downloading $Mirror"
Pop $R0 ;Get the return value
StrCmp $R0 "success" +3
- MessageBox MB_OK "Download failed: $R0"
+ MessageBox MB_OK "Download of http://sourceforge.net/projects/mingw/files/${DLDir}/${DLFile}/download?use_mirror=$Mirror failed: $R0"
Quit
-!macroend
+!macroend
-
- Var Dialog
- Var Label
- Var DropList
- Var Mirror
-
-
-
-
Function GetMirror
Push $0
Modified: trunk/xlw/MinGW_Installer/mingwFileList.nsh
===================================================================
--- trunk/xlw/MinGW_Installer/mingwFileList.nsh 2011-12-19 13:06:56 UTC (rev 1380)
+++ trunk/xlw/MinGW_Installer/mingwFileList.nsh 2012-01-09 13:21:42 UTC (rev 1381)
@@ -8,26 +8,26 @@
!define GPP_BIN "gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
!define GPP_DLL "libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
-!define CORE_BIN_DIR "MinGW/BaseSystem/GCC/Version4/gcc-4.5.2-1/"
+!define CORE_BIN_DIR "MinGW/Base/gcc/Version4/gcc-4.5.2-1"
;GDB
!define GDB "gdb-7.2-1-mingw32-bin.tar.lzma"
-!define GDB_DIR "MinGW/BaseSystem/GDB/GDB-7.2/"
+!define GDB_DIR "MinGW/Base/GDB/GDB-7.2/"
;MING RUNTIME
!define MINGW_RUNTIME_DLL "mingwrt-3.18-mingw32-dll.tar.gz"
!define MINGW_RUNTIME_DEV "mingwrt-3.18-mingw32-dev.tar.gz"
-!define MINGW_RUNTIME_DIR "MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-3.18/"
+!define MINGW_RUNTIME_DIR "MinGW/Base/RuntimeLibrary/MinGW-RT/mingwrt-3.18/"
; W32API
!define W32API "w32api-3.15-1-mingw32-dev.tar.lzma"
-!define W32API_DIR "MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-3.15/"
+!define W32API_DIR "MinGW/Base/RuntimeLibrary/Win32-API/w32api-3.15/"
; BINUTILS
!define BINUTILS "binutils-2.21-3-mingw32-bin.tar.lzma"
-!define BINUTILS_DIR "MinGW/BaseSystem/GNU-Binutils/binutils-2.21/"
+!define BINUTILS_DIR "MinGW/Base/GNU-Binutils/binutils-2.21/"
@@ -74,45 +74,45 @@
;MSYS
!define MSYS "msysCORE-1.0.16-1-msys-1.0.16-bin.tar.lzma"
!define MSYS_EXT "msysCORE-1.0.16-1-msys-1.0.16-ext.tar.lzma"
-!define MSYS_DIR "MSYS/BaseSystem/msys-core/msys-1.0.16-1/"
+!define MSYS_DIR "MSYS/Base/msys-core/msys-1.0.16-1/"
!define BASH "bash-3.1.17-4-msys-1.0.16-bin.tar.lzma"
-!define BASH_DIR "MSYS/BaseSystem/bash/bash-3.1.17-4/"
+!define BASH_DIR "MSYS/Base/bash/bash-3.1.17-4/"
!define CORE_UTILS "coreutils-5.97-3-msys-1.0.13-bin.tar.lzma"
!define CORE_EXT "coreutils-5.97-3-msys-1.0.13-ext.tar.lzma"
-!define CORE_UTILS_DIR "MSYS/BaseSystem/coreutils/coreutils-5.97-3/"
+!define CORE_UTILS_DIR "MSYS/Base/coreutils/coreutils-5.97-3/"
!define REGEX "libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma"
-!define REGEX_DIR "MSYS/BaseSystem/regex/regex-1.20090805-2/"
+!define REGEX_DIR "MSYS/Base/regex/regex-1.20090805-2/"
!define TAR "tar-1.23-1-msys-1.0.13-bin.tar.lzma"
!define TAR_EXT "tar-1.23-1-msys-1.0.13-ext.tar.lzma"
-!define TAR_DIR "MSYS/BaseSystem/tar/tar-1.23-1/"
+!define TAR_DIR "MSYS/Base/tar/tar-1.23-1/"
!define GZIP "gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma"
-!define GZIP_DIR "MSYS/BaseSystem/gzip/gzip-1.3.12-2/"
+!define GZIP_DIR "MSYS/Base/gzip/gzip-1.3.12-2/"
!define BZIP2 "bzip2-1.0.5-2-msys-1.0.13-bin.tar.lzma"
-!define BZIP2_DIR "MSYS/BaseSystem/bzip2/bzip2-1.0.5-2/"
+!define BZIP2_DIR "MSYS/Base/bzip2/bzip2-1.0.5-2/"
!define TERMCAP_DLL "libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma"
!define TERMCAP "termcap-0.20050421_1-2-msys-1.0.13-bin.tar.lzma"
-!define TERMCAP_DIR "MSYS/BaseSystem/termcap/termcap-0.20050421_1-2/"
+!define TERMCAP_DIR "MSYS/Base/termcap/termcap-0.20050421_1-2/"
!define DIFFUTILS "diffutils-2.8.7.20071206cvs-3-msys-1.0.13-bin.tar.lzma"
-!define DIFFUTILS_DIR "MSYS/BaseSystem/diffutils/diffutils-2.8.7.20071206cvs-3/"
+!define DIFFUTILS_DIR "MSYS/Base/diffutils/diffutils-2.8.7.20071206cvs-3/"
!define GAWK "gawk-3.1.7-2-msys-1.0.13-bin.tar.lzma"
-!define GAWK_DIR "MSYS/BaseSystem/gawk/gawk-3.1.7-2/"
+!define GAWK_DIR "MSYS/Base/gawk/gawk-3.1.7-2/"
!define GREP "grep-2.5.4-2-msys-1.0.13-bin.tar.lzma"
-!define GREP_DIR "MSYS/BaseSystem/grep/grep-2.5.4-2/"
+!define GREP_DIR "MSYS/Base/grep/grep-2.5.4-2/"
!define SED "sed-4.2.1-2-msys-1.0.13-bin.tar.lzma"
-!define SED_DIR "MSYS/BaseSystem/sed/sed-4.2.1-2/"
+!define SED_DIR "MSYS/Base/sed/sed-4.2.1-2/"
!define FINDUTILS "findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma"
!define FINDUTILS_DIR "MSYS/findutils/findutils-4.4.2-2/"
@@ -122,10 +122,10 @@
!define ASPRINTF "libasprintf-0.17-2-msys-dll-0.tar.lzma"
!define GETTEXT "gettext-0.17-2-msys-1.0.13-bin.tar.lzma"
!define GETTEXT_EXT "gettext-0.17-2-msys-1.0.13-ext.tar.lzma"
-!define GETTEXT_DIR "MSYS/BaseSystem/gettext/gettext-0.17-2/"
+!define GETTEXT_DIR "MSYS/Base/gettext/gettext-0.17-2/"
!define LIBI_MSYS_CONV2 "libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma"
!define LIBI_MSYS_CHARSET_MSYS "libcharset-1.13.1-2-msys-1.0.13-dll-1.tar.lzma"
!define LIBI_MSYS_CONV_BIN "libiconv-1.13.1-2-msys-1.0.13-bin.tar.lzma"
-!define LIBI_MSYS_CONV_DIR "MSYS/BaseSystem/libiconv/libiconv-1.13.1-2/"
+!define LIBI_MSYS_CONV_DIR "MSYS/Base/libiconv/libiconv-1.13.1-2/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|