[ros-diffs] [peterw] 30707: - Switch default install directory back to Program Files\RosBE. - Remove the installation directory on uninstall which wasn't being removed. - Bump the version to 1.1. - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon.

Author: peterw
Date: Sat Nov 24 01:34:50 2007
New Revision: 30707

URL: http://svn.reactos.org/svn/reactos?rev=30707&view=rev
Log:
- Switch default install directory back to Program Files\RosBE.
- Remove the installation directory on uninstall which wasn't being removed.
- Bump the version to 1.1.
- Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an
icon.

Added:
    trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico   (with props)
    trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd   (with props)
Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
    trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
    trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile

Added: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/mi…
==============================================================================
Binary file - no diff available.

Propchange: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (added)
+++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Nov 24 01:34:50 2007
@@ -1,0 +1,34 @@
+::
+:: PROJECT:     RosBE - ReactOS Build Environment for Windows
+:: LICENSE:     GPL - See LICENSE.txt in the top level directory.
+:: FILE:        Root/RosBE.cmd
+:: PURPOSE:     This script provides/sets up a standard MinGW build environment.
+:: COPYRIGHT:   Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de>
+::                             Peter Ward <dralnix(a)gmail.com>
+::
+::
+@echo off
+
+color 0A
+set PATH=%SystemRoot%\system32;%SystemRoot%
+set _ROSBE_BASEDIR=%~dp0
+set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
+set _ROSBE_MODE=MinGW
+set _ROSBE_ORIGINALPATH=%PATH%
+set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3
+
+if not "%1" == "" (
+    cls
+    echo Unknown parameter specified. Exiting.
+    goto :EOC
+)
+
+echo.
+echo.
+call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"
+echo.
+echo.
+
+doskey MAKE = "%_ROSBE_MINGWMAKE%" $*
+
+:EOC

Propchange: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Nov 24 01:34:50 2007
@@ -10,15 +10,22 @@
 ::
 @echo off
 
+if not "%1" == "" (
+    cls
+    echo Unknown parameter specified. Exiting.
+    goto :EOC
+)
+
 ::
 :: Set defaults to work with and override them if edited by
 :: the options utility.
 ::
 color 0A
 set PATH=%SystemRoot%\system32;%SystemRoot%
-set _ROSBE_VERSION=1.0
+set _ROSBE_VERSION=1.1
 set _ROSBE_BASEDIR=%~dp0
 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
+set _ROSBE_MODE=RosBE
 set _ROSBE_ROSSOURCEDIR=%CD%
 set _ROSBE_ORIGINALPATH=%PATH%
 set _ROSBE_SHOWTIME=1
@@ -46,21 +53,6 @@
 )
 
 title ReactOS Build Environment %_ROSBE_VERSION%
-
-::
-:: Make sure RosBE was initialized right.
-::
-if /i "%1" == "oldmode" (
-    cls
-    set _ROSBE_OLDMODE=""
-    call :RosBE4
-    goto :EndCommandParse
-)
-if not "%1" == "" (
-    cls
-    echo Unknown parameter specified. Exiting.
-    goto :EOC
-)
 
 cls
 call :RosBE4

Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Nov 24 01:34:50 2007
@@ -14,9 +14,7 @@
 :: initialize GCC for the current directory.
 ::
 if not defined _ROSBE_MINGWPATH (
-    if /i "%1" == "oldmode" (
-        set _ROSBE_OLDMODE=""
-    )
+    set _ROSBE_MODE=MinGW
     set _ROSBE_MINGWPATH=%CD%
     set _ROSBE_ORIGINALPATH=%PATH%
 )
@@ -29,12 +27,13 @@
 for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc
version""`) do set _ROSBE_GCCVERSION=%%i
 set
PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH%
 set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe
-if defined _ROSBE_OLDMODE (
+if "%_ROSBE_MODE%" == "MinGW" (
     set
C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include
     set
CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include
+) else (
+    set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include"
-I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include"
+    set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include"
-I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%"
-I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32"
-I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include"
 )
-set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include"
-I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include"
-set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include"
-I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%"
-I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32"
-I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include"
 set
LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%
 
 ::

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 24 01:34:50 2007
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "ReactOS Build Environment for Windows"
-!define PRODUCT_VERSION "1.0"
+!define PRODUCT_VERSION "1.1"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App
Paths\RosBE.cmd"
 !define PRODUCT_UNINST_KEY
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKCU"
@@ -10,6 +10,7 @@
 ;;
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "RosBE-${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\RosBE"
 InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -17,7 +18,7 @@
 ;;
 ;; Add version/product information metadata to the installation file.
 ;;
-VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0"
+VIAddVersionKey /LANG=1033 "FileVersion" "1.1.0.0"
 VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
 VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter
Ward and Daniel Reimer using Nullsoft Scriptable Install System
(http://nsis.sourceforge.net/)"
@@ -25,7 +26,7 @@
 VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS
Team"
 VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS
Team"
 VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
-VIProductVersion "1.0.0.0"
+VIProductVersion "1.1.0.0"
 
 CRCCheck force
 SetCompressor /FINAL /SOLID lzma
@@ -41,9 +42,6 @@
 ;; Read our custom page ini, remove previous version.
 ;;
 Function .onInit
-    var /global SYSTEMDRIVE
-    StrCpy $SYSTEMDRIVE $WINDIR 2
-    StrCpy $INSTDIR "$SYSTEMDRIVE\RosBE"
     Call UninstallPrevious
     !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini"
 FunctionEnd
@@ -104,11 +102,13 @@
     SetShellVarContext current
     SetOutPath "$INSTDIR"
     SetOverwrite try
+    File /r Icons\mingw.ico
     File /r Icons\rosbe.ico
     File /r Root\readme.pdf
     File /r Root\RosBE.mac
     File /r Root\changelog.txt
     File /r Root\LICENSE.txt
+    File /r Root\MinGW.cmd
     File /r Root\README.txt
     File /r Root\Build.cmd
     File /r Root\Clean.cmd
@@ -118,12 +118,12 @@
     File /r Root\TimeDate.cmd
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
-    File /r Root\Tools\buildtime.exe
-    File /r Root\Tools\chknewer.exe
-    File /r Root\Tools\cpucount.exe
-    File /r Root\Tools\flash.exe
-    File /r Root\Tools\getdate.exe
-    File /r Root\Tools\tee.exe
+    File /r Components\Tools\buildtime.exe
+    File /r Components\Tools\chknewer.exe
+    File /r Components\Tools\cpucount.exe
+    File /r Components\Tools\flash.exe
+    File /r Components\Tools\getdate.exe
+    File /r Components\Tools\tee.exe
 SectionEnd
 
 Section -MinGWGCCNASM SEC02
@@ -139,7 +139,7 @@
     File /r Root\options.cmd
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
-    File /r Root\Tools\options.exe
+    File /r Components\Tools\options.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
         SetOutPath $REACTOS_SOURCE_DIRECTORY
@@ -155,17 +155,17 @@
     File /r Root\sSVN.cmd
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
-    File /r Root\Tools\svn.exe
-    File /r Root\Tools\intl3_svn.dll
-    File /r Root\Tools\libapr.dll
-    File /r Root\Tools\libeay32.dll
-    File /r Root\Tools\ssleay32.dll
-    File /r Root\Tools\libaprutil.dll
-    File /r Root\Tools\libapriconv.dll
-    File /r Root\Tools\libdb44.dll
+    File /r Components\Tools\svn.exe
+    File /r Components\Tools\intl3_svn.dll
+    File /r Components\Tools\libapr.dll
+    File /r Components\Tools\libeay32.dll
+    File /r Components\Tools\ssleay32.dll
+    File /r Components\Tools\libaprutil.dll
+    File /r Components\Tools\libapriconv.dll
+    File /r Components\Tools\libdb44.dll
     SetOutPath "$INSTDIR\Tools\licenses"
     SetOverwrite try
-    File /r Root\Tools\licenses\*.*
+    File /r Components\Tools\licenses\*.*
 SectionEnd
 
 Section "Shortcut Tool (scut)" SEC05
@@ -175,23 +175,23 @@
     File /r Root\scut.cmd
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
-    File /r Root\Tools\scut.exe
+    File /r Components\Tools\scut.exe
 SectionEnd
 
 Section "ccache - Compiler Cache" SEC06
     SetShellVarContext current
     SetOutPath "$INSTDIR\4.1.3\bin"
     SetOverwrite try
-    File /r Root\Tools\ccache.exe
-    File /r Root\Tools\cygwin1.dll
+    File /r Components\Tools\ccache.exe
+    File /r Components\Tools\cygwin1.dll
 SectionEnd
 
 Section "GDB - The GNU Project Debugger" SEC07
     SetShellVarContext current
     SetOutPath "$INSTDIR\4.1.3\bin"
     SetOverwrite try
-    File /r Root\Tools\gdb.exe
-    File /r Root\Tools\gdbserver.exe
+    File /r Components\Tools\gdb.exe
+    File /r Components\Tools\gdbserver.exe
 SectionEnd
 
 Section "relAddr2Line Tool" SEC08
@@ -201,9 +201,9 @@
     File /r Root\reladdr2line.cmd
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
-    File /r Root\Tools\echoh.exe
-    File /r Root\Tools\raddr2line.exe
-    File /r Root\Tools\chkslash.exe
+    File /r Components\Tools\echoh.exe
+    File /r Components\Tools\raddr2line.exe
+    File /r Components\Tools\chkslash.exe
 SectionEnd
 
 Section "Other Tools (chdefdir, chdefgcc and config)" SEC09
@@ -225,6 +225,8 @@
         CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
         SetOutPath $REACTOS_SOURCE_DIRECTORY
         CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
+        SetOutPath $DOCUMENTS
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build
Environment.lnk" "$SYSDIR\cmd.exe" '/k
"$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico"
         SetOutPath $INSTDIR
         CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \
                        "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
@@ -241,6 +243,8 @@
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
     CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
+    SetOutPath $DOCUMENTS
+    CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"'
"$INSTDIR\mingw.ico"
 SectionEnd
 
 Section /o "Quick Launch Shortcuts" SEC12
@@ -251,6 +255,8 @@
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
     CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
+    SetOutPath $DOCUMENTS
+    CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"'
"$INSTDIR\mingw.ico"
 SectionEnd
 
 Section -Post SEC13
@@ -303,14 +309,21 @@
     Delete /REBOOTOK "$INSTDIR\RosBE.mac"
     Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"
     Delete /REBOOTOK "$INSTDIR\LICENSE.txt"
+    Delete /REBOOTOK "$INSTDIR\MinGW.cmd"
+    Delete /REBOOTOK "$INSTDIR\mingw.ico"
     Delete /REBOOTOK "$INSTDIR\README.txt"
     Delete /REBOOTOK "$INSTDIR\srclist.txt"
     Delete /REBOOTOK "$INSTDIR\config.rbuild"
     Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
+    RMDir /r /REBOOTOK "$INSTDIR"
     IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2
         Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
     IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2
         Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk"
+    IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2
+        Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk"
+    IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2
+        Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
 
     ;;
     ;; Clean up the registry.

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile Sat Nov 24 01:34:50 2007
@@ -5,7 +5,7 @@
 all: $(TARGET)
 
 CC=gcc
-CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99
+CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99
 LFLAGS := -mwindows -s
 LIBS :=
 
@@ -21,7 +21,7 @@
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(RC:.rc=.coff):
-	windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC)
+	windres $(RCFLAGS) -o $@ $(RC)
 
 .PHONY: clean
 clean: