[Scummvm-cvs-logs] scummvm-tools master -> 6f6f0c52ce27ff04652e22fd9b8636034f5367d9

Littleboy littleboy22 at gmail.com
Tue Jun 21 22:12:48 CEST 2011 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
22786988c4 DISTS: Remove mingw dll from setup (it is no longer needed)
6f6f0c52ce TOOLS: Add Makefile target to build a NSIS installer


Commit: 22786988c43fe6bd5461583b22ee6e387d3eb73f
    https://github.com/scummvm/scummvm-tools/commit/22786988c43fe6bd5461583b22ee6e387d3eb73f
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-21T13:09:26-07:00

Commit Message:
DISTS: Remove mingw dll from setup (it is no longer needed)

Changed paths:
    dists/nsis/scummvm-tools.nsi
    dists/nsis/scummvm-tools.nsi.in



diff --git a/dists/nsis/scummvm-tools.nsi b/dists/nsis/scummvm-tools.nsi
index 967a272..5ed843d 100644
--- a/dists/nsis/scummvm-tools.nsi
+++ b/dists/nsis/scummvm-tools.nsi
@@ -238,8 +238,7 @@ Section "ScummVM" SecMain
 	File "${build_dir}\gob_loadcalc.exe"
 	File "${build_dir}\scummvm-tools.exe"
 	File "${build_dir}\scummvm-tools-cli.exe"
-	File "${build_dir}\mingwm10.dll"
-	
+
 	# Media
 	SetOutPath $INSTDIR\media
 	File "${media_dir}\detaillogo.jpg"
@@ -298,8 +297,7 @@ Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
 	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
 	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
-	Delete /REBOOTOK $INSTDIR\mingwm10.dll"
-	
+
 	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
 	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
 	Delete /REBOOTOK $INSTDIR\media\tile.gif"
diff --git a/dists/nsis/scummvm-tools.nsi.in b/dists/nsis/scummvm-tools.nsi.in
index b2ffb7c..fb502c7 100644
--- a/dists/nsis/scummvm-tools.nsi.in
+++ b/dists/nsis/scummvm-tools.nsi.in
@@ -238,8 +238,7 @@ Section "ScummVM" SecMain
 	File "${build_dir}\gob_loadcalc.exe"
 	File "${build_dir}\scummvm-tools.exe"
 	File "${build_dir}\scummvm-tools-cli.exe"
-	File "${build_dir}\mingwm10.dll"
-	
+
 	# Media
 	SetOutPath $INSTDIR\media
 	File "${media_dir}\detaillogo.jpg"
@@ -298,8 +297,7 @@ Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\gob_loadcalc.exe"
 	Delete /REBOOTOK $INSTDIR\scummvm-tools.exe"
 	Delete /REBOOTOK $INSTDIR\scummvm-tools-cli.exe"
-	Delete /REBOOTOK $INSTDIR\mingwm10.dll"
-	
+
 	Delete /REBOOTOK $INSTDIR\media\detaillogo.jpg"
 	Delete /REBOOTOK $INSTDIR\media\logo.jpg"
 	Delete /REBOOTOK $INSTDIR\media\tile.gif"


Commit: 6f6f0c52ce27ff04652e22fd9b8636034f5367d9
    https://github.com/scummvm/scummvm-tools/commit/6f6f0c52ce27ff04652e22fd9b8636034f5367d9
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-21T13:10:48-07:00

Commit Message:
TOOLS: Add Makefile target to build a NSIS installer

Changed paths:
    Makefile



diff --git a/Makefile b/Makefile
index 34f2ced..1af0835 100644
--- a/Makefile
+++ b/Makefile
@@ -81,28 +81,40 @@ else
 endif
 
 # Special target to create a win32 tools snapshot binary
-WIN32PATH=C:/scummvm
-
-win32dist:   all
-	mkdir -p $(WIN32PATH)
-	mkdir -p $(WIN32PATH)/tools
-	mkdir -p $(WIN32PATH)/tools/media
-	cp gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
-	cp gui/media/logo.jpg $(WIN32PATH)/tools/media/
-	cp gui/media/tile.gif $(WIN32PATH)/tools/media/
-	strip decine.exe -o $(WIN32PATH)/tools/decine.exe
-	strip degob.exe -o $(WIN32PATH)/tools/degob.exe
-	strip dekyra.exe -o $(WIN32PATH)/tools/dekyra.exe
-	strip deriven.exe -o $(WIN32PATH)/tools/deriven.exe
-	strip descumm.exe -o $(WIN32PATH)/tools/descumm.exe
-	strip desword2.exe -o $(WIN32PATH)/tools/desword2.exe
-	strip extract_mohawk.exe -o $(WIN32PATH)/tools/extract_mohawk.exe
-	strip construct_mohawk.exe -o $(WIN32PATH)/tools/construct_mohawk.exe
-	strip gob_loadcalc.exe -o $(WIN32PATH)/tools/gob_loadcalc.exe
-	strip scummvm-tools.exe -o $(WIN32PATH)/tools/scummvm-tools.exe
-	strip scummvm-tools-cli.exe -o $(WIN32PATH)/tools/scummvm-tools-cli.exe
-	cp *.bat $(WIN32PATH)/tools
-	cp COPYING $(WIN32PATH)/tools/COPYING.txt
-	cp README $(WIN32PATH)/tools/README.txt
-	cp NEWS $(WIN32PATH)/tools/NEWS.txt
-	u2d $(WIN32PATH)/tools/*.txt
+WIN32PATH=build
+
+# Special target to prepare data files for distribution / installer creation
+win32data:
+	mkdir -p $(srcdir)/$(WIN32PATH)
+	cp $(srcdir)/COPYING          $(srcdir)/$(WIN32PATH)
+	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32PATH)
+	cp $(srcdir)/README           $(srcdir)/$(WIN32PATH)
+	unix2dos $(srcdir)/$(WIN32PATH)/*.*
+	$(STRIP) decine.exe             -o $(srcdir)/$(WIN32PATH)/decine.exe
+	$(STRIP) degob.exe              -o $(srcdir)/$(WIN32PATH)/degob.exe
+	$(STRIP) dekyra.exe             -o $(srcdir)/$(WIN32PATH)/dekyra.exe
+	$(STRIP) deriven.exe            -o $(srcdir)/$(WIN32PATH)/deriven.exe
+	$(STRIP) descumm.exe            -o $(srcdir)/$(WIN32PATH)/descumm.exe
+	$(STRIP) desword2.exe           -o $(srcdir)/$(WIN32PATH)/desword2.exe
+	$(STRIP) extract_mohawk.exe     -o $(srcdir)/$(WIN32PATH)/extract_mohawk.exe
+	$(STRIP) construct_mohawk.exe   -o $(srcdir)/$(WIN32PATH)/construct_mohawk.exe
+	$(STRIP) gob_loadcalc.exe       -o $(srcdir)/$(WIN32PATH)/gob_loadcalc.exe
+	$(STRIP) scummvm-tools.exe      -o $(srcdir)/$(WIN32PATH)/scummvm-tools.exe
+	$(STRIP) scummvm-tools-cli.exe  -o $(srcdir)/$(WIN32PATH)/scummvm-tools-cli.exe
+
+# Special target to create a win32 snapshot binary (for Inno Setup)
+win32dist: win32data all
+	mkdir -p $(srcdir)/$(WIN32PATH)/tools
+	mv $(srcdir)/$(WIN32PATH)/*.* $(srcdir)/$(WIN32PATH)/tools/
+	cp $(srcdir)/*.bat $(srcdir)/$(WIN32PATH)/tools
+	mkdir -p $(srcdir)/$(WIN32PATH)/tools/media
+	cp $(srcdir)/gui/media/detaillogo.jpg  $(srcdir)/$(WIN32PATH)/tools/media/
+	cp $(srcdir)/gui/media/logo.jpg        $(srcdir)/$(WIN32PATH)/tools/media/
+	cp $(srcdir)/gui/media/tile.gif        $(srcdir)/$(WIN32PATH)/tools/media/
+	mv $(srcdir)/$(WIN32PATH)/COPYING      $(srcdir)/$(WIN32PATH)/tools/COPYING.txt
+	mv $(srcdir)/$(WIN32PATH)/README       $(srcdir)/$(WIN32PATH)/tools/README.txt
+	mv $(srcdir)/$(WIN32PATH)/NEWS         $(srcdir)/$(WIN32PATH)/tools/NEWS.txt
+
+# Special target to create a win32 NSIS installer
+win32setup: win32data all
+	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32PATH)" -Dbuild_dir="../../$(WIN32PATH)" $(srcdir)/dists/nsis/scummvm-tools.nsi

More information about the Scummvm-git-logs mailing list