X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=monowiz.win32.nsi;h=fba80ef2e3a794c58dec259fc56bb4dba6c17ca3;hb=13fd028ee87066b157b66904f8cc7ee8d8cf7181;hp=783c01338a41872ae156d42b0b72abae86982880;hpb=423cbb8537888da9e1f4c7eb94e464854a26a4af;p=mono.git

diff --git a/monowiz.win32.nsi b/monowiz.win32.nsi
index 783c01338a4..fba80ef2e3a 100644
--- a/monowiz.win32.nsi
+++ b/monowiz.win32.nsi
@@ -110,18 +110,18 @@
 !define TARGET_INSTALL_DIR "$PROGRAMFILES\Mono-${MILESTONE}" 
 !define OUTFILE mono-${MILESTONE}-win32-${BUILDNUM}.exe
 
-Name ${NAME}
-Caption "Mono ${MILESTONE} Build ${BUILDNUM} Setup"
-
-SetCompressor bzip2
-SilentInstall normal
-ShowInstDetails show
-SetDateSave on
-SetDatablockOptimize on
-CRCCheck on
-BGGradient 000000 800000 FFFFFF
-InstallColors FF8080 000030
-XPStyle on
+Name ${NAME}
+Caption "Mono ${MILESTONE} Build ${BUILDNUM} Setup"
+
+SetCompressor bzip2
+SilentInstall normal
+ShowInstDetails show
+SetDateSave on
+SetDatablockOptimize on
+CRCCheck on
+BGGradient 000000 800000 FFFFFF
+InstallColors FF8080 000030
+XPStyle on
 AutoCloseWindow false
 
 ; =====================================================
@@ -132,25 +132,25 @@ AutoCloseWindow false
 #!define MUI_DIRECTORYPAGE
 #!define MUI_DIRECTORYSELECTIONPAGE
  
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Mono for Windows.\r\n\r\n\r\n$_CLICK"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_LINK "Visit Mono's website for the latest news"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.go-mono.com/"
-
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Mono for Windows.\r\n\r\n\r\n$_CLICK"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_LINK "Visit Mono's website for the latest news"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.go-mono.com/"
+
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
  
 !insertmacro MUI_LANGUAGE "ENGLISH"
 
-AutoCloseWindow false
+AutoCloseWindow false
 ShowInstDetails show
 
 OutFile ${OUTFILE}
@@ -214,7 +214,7 @@ SectionEnd
 
  WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono\${MILESTONE} SdkInstallRoot $INSTDIR
  WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono\${MILESTONE} FrameworkAssemblyDirectory $INSTDIR\lib
- WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono\${MILESTONE} MonoConfigDir $INSTDIR\etc\mono
+ WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono\${MILESTONE} MonoConfigDir $INSTDIR\etc
  ;WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono\${MILESTONE} GtkSharpLibPath $INSTDIR\lib
  WriteRegStr HKEY_LOCAL_MACHINE SOFTWARE\Mono DefaultCLR ${MILESTONE}
 
@@ -265,84 +265,84 @@ Call PushBatFiles
 Call createWindowsBatFiles
 Pop $0
 
-; ============= glib-2.0.pc ===============
-FileOpen $0 "$INSTDIR\lib\pkgconfig\glib-2.0.pc" "w"
-FileWrite $0 "prefix=$6$\r$\n"
-FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
-FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
-FileWrite $0 "includedir=$${prefix}/include$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "glib_genmarshal=glib-genmarshal$\r$\n"
-FileWrite $0 "gobject_query=gobject-query$\r$\n"
-FileWrite $0 "glib_mkenums=glib-mkenums$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "Name: GLib$\r$\n"
-FileWrite $0 "Description: C Utility Library$\r$\n"
-FileWrite $0 "Version: 2.0.4$\r$\n"
-FileWrite $0 "Libs: -L$${libdir} -lglib-2.0 -lintl -liconv $\r$\n"
-FileWrite $0 "Cflags: -I$${includedir}/glib-2.0 -I$${libdir}/glib-2.0/include $\r$\n"
+; ============= glib-2.0.pc ===============
+FileOpen $0 "$INSTDIR\lib\pkgconfig\glib-2.0.pc" "w"
+FileWrite $0 "prefix=$6$\r$\n"
+FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
+FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
+FileWrite $0 "includedir=$${prefix}/include$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "glib_genmarshal=glib-genmarshal$\r$\n"
+FileWrite $0 "gobject_query=gobject-query$\r$\n"
+FileWrite $0 "glib_mkenums=glib-mkenums$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "Name: GLib$\r$\n"
+FileWrite $0 "Description: C Utility Library$\r$\n"
+FileWrite $0 "Version: 2.0.4$\r$\n"
+FileWrite $0 "Libs: -L$${libdir} -lglib-2.0 -lintl -liconv $\r$\n"
+FileWrite $0 "Cflags: -I$${includedir}/glib-2.0 -I$${libdir}/glib-2.0/include $\r$\n"
+FileClose $0
+
+; ============= gmodule-2.0.pc ===============
+FileOpen $0 "$INSTDIR\lib\pkgconfig\gmodule-2.0.pc" "w"
+FileWrite $0 "prefix=$6$\r$\n"
+FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
+FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
+FileWrite $0 "includedir=$${prefix}/include$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "gmodule_supported=true$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "Name: GModule$\r$\n"
+FileWrite $0 "Description: Dynamic module loader for GLib$\r$\n"
+FileWrite $0 "Requires: glib-2.0$\r$\n"
+FileWrite $0 "Version: 2.0.4$\r$\n"
+FileWrite $0 "Libs: -L$${libdir} -lgmodule-2.0 $\r$\n"
+FileWrite $0 "Cflags:$\r$\n"
+FileClose $0
+
+; ============= gobject-2.0.pc ===============
+FileOpen $0 "$INSTDIR\lib\pkgconfig\gobject-2.0.pc" "w"
+FileWrite $0 "prefix=$6$\r$\n"
+FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
+FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
+FileWrite $0 "includedir=$${prefix}/include$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "Name: GObject$\r$\n"
+FileWrite $0 "Description: GLib Type, Object, Parameter and Signal Library$\r$\n"
+FileWrite $0 "Requires: glib-2.0$\r$\n"
+FileWrite $0 "Version: 2.0.4$\r$\n"
+FileWrite $0 "Libs: -L$${libdir} -lgobject-2.0$\r$\n"
+FileWrite $0 "Cflags:$\r$\n"
+FileClose $0
+
+; ============= gthread-2.0.pc ===============
+FileOpen $0 "$INSTDIR\lib\pkgconfig\gthread-2.0.pc" "w"
+FileWrite $0 "prefix=$6$\r$\n"
+FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
+FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
+FileWrite $0 "includedir=$${prefix}/include$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "Name: GThread$\r$\n"
+FileWrite $0 "Description: Thread support for GLib$\r$\n"
+FileWrite $0 "Requires: glib-2.0$\r$\n"
+FileWrite $0 "Version: 2.0.4$\r$\n"
+FileWrite $0 "Libs: -L$${libdir} -lgthread-2.0 $\r$\n"
+FileWrite $0 "Cflags: -D_REENTRANT$\r$\n"
+FileClose $0
+
+; ============= libintl.pc ===============
+FileOpen $0 "$INSTDIR\lib\pkgconfig\libintl.pc" "w"
+FileWrite $0 "prefix=$6$\r$\n"
+FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
+FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
+FileWrite $0 "includedir=$${prefix}/include$\r$\n"
+FileWrite $0 "$\r$\n"
+FileWrite $0 "Name: libintl$\r$\n"
+FileWrite $0 "Description: The intl library from GNU gettext$\r$\n"
+FileWrite $0 "Version: 0.10.40-tml$\r$\n"
+FileWrite $0 "Libs: -L$${libdir} -lintl$\r$\n"
+FileWrite $0 "Cflags: -I$${includedir}$\r$\n"
 FileClose $0
-
-; ============= gmodule-2.0.pc ===============
-FileOpen $0 "$INSTDIR\lib\pkgconfig\gmodule-2.0.pc" "w"
-FileWrite $0 "prefix=$6$\r$\n"
-FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
-FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
-FileWrite $0 "includedir=$${prefix}/include$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "gmodule_supported=true$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "Name: GModule$\r$\n"
-FileWrite $0 "Description: Dynamic module loader for GLib$\r$\n"
-FileWrite $0 "Requires: glib-2.0$\r$\n"
-FileWrite $0 "Version: 2.0.4$\r$\n"
-FileWrite $0 "Libs: -L$${libdir} -lgmodule-2.0 $\r$\n"
-FileWrite $0 "Cflags:$\r$\n"
-FileClose $0
-
-; ============= gobject-2.0.pc ===============
-FileOpen $0 "$INSTDIR\lib\pkgconfig\gobject-2.0.pc" "w"
-FileWrite $0 "prefix=$6$\r$\n"
-FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
-FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
-FileWrite $0 "includedir=$${prefix}/include$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "Name: GObject$\r$\n"
-FileWrite $0 "Description: GLib Type, Object, Parameter and Signal Library$\r$\n"
-FileWrite $0 "Requires: glib-2.0$\r$\n"
-FileWrite $0 "Version: 2.0.4$\r$\n"
-FileWrite $0 "Libs: -L$${libdir} -lgobject-2.0$\r$\n"
-FileWrite $0 "Cflags:$\r$\n"
-FileClose $0
-
-; ============= gthread-2.0.pc ===============
-FileOpen $0 "$INSTDIR\lib\pkgconfig\gthread-2.0.pc" "w"
-FileWrite $0 "prefix=$6$\r$\n"
-FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
-FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
-FileWrite $0 "includedir=$${prefix}/include$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "Name: GThread$\r$\n"
-FileWrite $0 "Description: Thread support for GLib$\r$\n"
-FileWrite $0 "Requires: glib-2.0$\r$\n"
-FileWrite $0 "Version: 2.0.4$\r$\n"
-FileWrite $0 "Libs: -L$${libdir} -lgthread-2.0 $\r$\n"
-FileWrite $0 "Cflags: -D_REENTRANT$\r$\n"
-FileClose $0
-
-; ============= libintl.pc ===============
-FileOpen $0 "$INSTDIR\lib\pkgconfig\libintl.pc" "w"
-FileWrite $0 "prefix=$6$\r$\n"
-FileWrite $0 "exec_prefix=$${prefix}$\r$\n"
-FileWrite $0 "libdir=$${exec_prefix}/lib$\r$\n"
-FileWrite $0 "includedir=$${prefix}/include$\r$\n"
-FileWrite $0 "$\r$\n"
-FileWrite $0 "Name: libintl$\r$\n"
-FileWrite $0 "Description: The intl library from GNU gettext$\r$\n"
-FileWrite $0 "Version: 0.10.40-tml$\r$\n"
-FileWrite $0 "Libs: -L$${libdir} -lintl$\r$\n"
-FileWrite $0 "Cflags: -I$${includedir}$\r$\n"
-FileClose $0
 
 Call CreateSetMonoPath
 Call RunGacutil