[Scummvm-cvs-logs] scummvm master -> 7cc965d24b9e7c67f54de520504fa5ead0970bd5
Littleboy
littleboy22 at gmail.com
Thu May 12 00:17:01 CEST 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
217089adfa CONFIGURE: Fix creation of the NSIS installer when building out of tree
3cb7d4b1cc NSIS: Add option to not include data files in the installer (they are now included in the exe by default)
7cc965d24b CREATE_PROJECT: Only copy necessary data files in postbuild script
Commit: 217089adfa998a62deb4c1a3fc7613888fcd23cb
https://github.com/scummvm/scummvm/commit/217089adfa998a62deb4c1a3fc7613888fcd23cb
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-05-11T14:54:34-07:00
Commit Message:
CONFIGURE: Fix creation of the NSIS installer when building out of tree
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 1234a69..574d78f 100644
--- a/ports.mk
+++ b/ports.mk
@@ -164,38 +164,39 @@ osxsnap: bundle
scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
-# Special target to create a win32 snapshot binary
-win32dist: $(EXECUTABLE)
- mkdir -p $(WIN32PATH)
- $(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
- cp $(DIST_FILES_THEMES) $(WIN32PATH)
+# Special target to prepare data files for distribution / installer creation
+win32data: $(EXECUTABLE)
+ mkdir -p $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/AUTHORS $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/COPYING $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/COPYING.LGPL $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/COPYRIGHT $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/NEWS $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/README $(srcdir)/$(WIN32PATH)
+ cp /usr/local/README-SDL.txt $(srcdir)/$(WIN32PATH)/README-SDL
+ unix2dos $(srcdir)/$(WIN32PATH)/*.*
+ $(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32PATH)/$(EXECUTABLE)
+ cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32PATH)
ifdef DIST_FILES_ENGINEDATA
- cp $(DIST_FILES_ENGINEDATA) $(WIN32PATH)
-endif
- cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
- cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
- cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
- cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
- cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
- cp $(srcdir)/README $(WIN32PATH)/README.txt
- cp /usr/local/README-SDL.txt $(WIN32PATH)
- cp /usr/local/bin/SDL.dll $(WIN32PATH)
- cp $(srcdir)/icons/scummvm.ico $(WIN32PATH)
- cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
- unix2dos $(WIN32PATH)/*.txt
-
-# Special target to create a win32 installer
-# (extensions for text files are removed, as they are read
-# as-is by the setup script and renamed there)
-win32setup: win32dist
- mv $(WIN32PATH)/AUTHORS.txt $(WIN32PATH)/AUTHORS
- mv $(WIN32PATH)/COPYING.txt $(WIN32PATH)/COPYING
- mv $(WIN32PATH)/COPYING.LGPL.txt $(WIN32PATH)/COPYING.LGPL
- mv $(WIN32PATH)/COPYRIGHT.txt $(WIN32PATH)/COPYRIGHT
- mv $(WIN32PATH)/NEWS.txt $(WIN32PATH)/NEWS
- mv $(WIN32PATH)/README.txt $(WIN32PATH)/README
- mv $(WIN32PATH)/README-SDL.txt $(WIN32PATH)/README-SDL
- makensis -V2 -Dtop_srcdir="../../$(srcdir)" -Dtext_dir="../../$(WIN32PATH)" -Dbuild_dir="../../$(WIN32PATH)" $(srcdir)/dists/nsis/scummvm.nsi
+ cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32PATH)
+endif
+ cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32PATH)
+
+# Special target to create a win32 snapshot binary (for Inno Setup)
+win32dist: win32data
+ cp $(srcdir)/icons/scummvm.ico $(srcdir)/$(WIN32PATH)
+ cp $(srcdir)/dists/win32/ScummVM.iss $(srcdir)/$(WIN32PATH)
+ mv $(WIN32PATH)/AUTHORS $(srcdir)/$(WIN32PATH)/AUTHORS.txt
+ mv $(WIN32PATH)/COPYING $(srcdir)/$(WIN32PATH)/COPYING.txt
+ mv $(WIN32PATH)/COPYING.LGPL $(srcdir)/$(WIN32PATH)/COPYING.LGPL.txt
+ mv $(WIN32PATH)/COPYRIGHT $(srcdir)/$(WIN32PATH)/COPYRIGHT.txt
+ mv $(WIN32PATH)/NEWS $(srcdir)/$(WIN32PATH)/NEWS.txt
+ mv $(WIN32PATH)/README $(srcdir)/$(WIN32PATH)/README.txt
+ mv $(WIN32PATH)/README-SDL $(srcdir)/$(WIN32PATH)/README-SDL.txt
+
+# Special target to create a win32 NSIS installer
+win32setup: win32data
+ makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32PATH)" -Dbuild_dir="../../$(WIN32PATH)" $(srcdir)/dists/nsis/scummvm.nsi
#
# AmigaOS specific
Commit: 3cb7d4b1cc9cbf2071666443e6790ced8ec2ffb2
https://github.com/scummvm/scummvm/commit/3cb7d4b1cc9cbf2071666443e6790ced8ec2ffb2
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-05-11T14:58:29-07:00
Commit Message:
NSIS: Add option to not include data files in the installer (they are now included in the exe by default)
Changed paths:
dists/nsis/scummvm.nsi
dists/nsis/scummvm.nsi.in
diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi
index aeabcca..50ccada 100644
--- a/dists/nsis/scummvm.nsi
+++ b/dists/nsis/scummvm.nsi
@@ -19,6 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#!define _DEBUG
+#!define _INCLUDE_DATA_FILES
Name ScummVM
@@ -231,6 +232,7 @@ Section "ScummVM" SecMain
File /oname=README.txt "${text_dir}\README"
File /oname=README-SDL.txt "${build_dir}\README-SDL"
+!ifdef _INCLUDE_DATA_FILES
# Engine data
File "${engine_data}\drascula.dat"
File "${engine_data}\hugo.dat"
@@ -248,6 +250,7 @@ Section "ScummVM" SecMain
File "${theme_data}\scummclassic.zip"
File "${theme_data}\scummmodern.zip"
File "${theme_data}\translations.dat"
+!endif
# Main exe and dlls
File "${build_dir}\scummvm.exe"
@@ -299,6 +302,7 @@ Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\README.txt
Delete /REBOOTOK $INSTDIR\README-SDL.txt
+!ifdef _INCLUDE_DATA_FILES
Delete /REBOOTOK $INSTDIR\drascula.dat
Delete /REBOOTOK $INSTDIR\hugo.dat
Delete /REBOOTOK $INSTDIR\kyra.dat
@@ -314,6 +318,7 @@ Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\scummclassic.zip
Delete /REBOOTOK $INSTDIR\scummmodern.zip
Delete /REBOOTOK $INSTDIR\translations.dat
+!endif
Delete /REBOOTOK $INSTDIR\scummvm.exe
Delete /REBOOTOK $INSTDIR\SDL.dll
diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in
index 766a206..c94e594 100644
--- a/dists/nsis/scummvm.nsi.in
+++ b/dists/nsis/scummvm.nsi.in
@@ -19,6 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#!define _DEBUG
+#!define _INCLUDE_DATA_FILES
Name ScummVM
@@ -231,6 +232,7 @@ Section "ScummVM" SecMain
File /oname=README.txt "${text_dir}\README"
File /oname=README-SDL.txt "${build_dir}\README-SDL"
+!ifdef _INCLUDE_DATA_FILES
# Engine data
File "${engine_data}\drascula.dat"
File "${engine_data}\hugo.dat"
@@ -248,6 +250,7 @@ Section "ScummVM" SecMain
File "${theme_data}\scummclassic.zip"
File "${theme_data}\scummmodern.zip"
File "${theme_data}\translations.dat"
+!endif
# Main exe and dlls
File "${build_dir}\scummvm.exe"
@@ -299,6 +302,7 @@ Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\README.txt
Delete /REBOOTOK $INSTDIR\README-SDL.txt
+!ifdef _INCLUDE_DATA_FILES
Delete /REBOOTOK $INSTDIR\drascula.dat
Delete /REBOOTOK $INSTDIR\hugo.dat
Delete /REBOOTOK $INSTDIR\kyra.dat
@@ -314,6 +318,7 @@ Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\scummclassic.zip
Delete /REBOOTOK $INSTDIR\scummmodern.zip
Delete /REBOOTOK $INSTDIR\translations.dat
+!endif
Delete /REBOOTOK $INSTDIR\scummvm.exe
Delete /REBOOTOK $INSTDIR\SDL.dll
Commit: 7cc965d24b9e7c67f54de520504fa5ead0970bd5
https://github.com/scummvm/scummvm/commit/7cc965d24b9e7c67f54de520504fa5ead0970bd5
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-05-11T15:13:22-07:00
Commit Message:
CREATE_PROJECT: Only copy necessary data files in postbuild script
Changed paths:
devtools/create_project/scripts/installer.vbs
devtools/create_project/scripts/postbuild.cmd
diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs
index 6bcd794..d752355 100644
--- a/devtools/create_project/scripts/installer.vbs
+++ b/devtools/create_project/scripts/installer.vbs
@@ -73,7 +73,7 @@ Sub CreateInstaller()
Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _
" /Dtop_srcdir=""" & rootFolder & """" & _
" /Dbuild_dir=""" & targetFolder & """" & _
- " /Dtext_dir=""" & targetFolder & """" & _
+ " /Dtext_dir=""" & rootFolder & """" & _
" /DARCH=""" & arch & """" & _
" """ & rootFolder & "\dists\nsis\scummvm.nsi"""
diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index e788614..75a916d 100644
--- a/devtools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
@@ -23,23 +23,24 @@ if "%~5"=="" goto error_installer
echo Copying data files
echo.
-xcopy /F /Y "%~1/AUTHORS" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING.GPL" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING.LGPL" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYRIGHT" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/NEWS" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/README" %~2 > NUL 2>&1
-
-xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/gui/themes/*.zip" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 > NUL 2>&1
-xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 > NUL 2>&1
-xcopy /F /Y "%~4/README-SDL" %~2 > NUL 2>&1
-
-xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 > NUL 2>&1
+REM xcopy /F /Y "%~1/AUTHORS" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING.GPL" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING.LGPL" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYRIGHT" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/NEWS" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/README" %~2 1>NUL 2>&1
+
+REM xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1
+
+xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 1>NUL 2>&1
+xcopy /F /Y "%~4/README-SDL" %~2 1>NUL 2>&1
+
+xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 1>NUL 2>&1
if "%~5"=="0" goto done
More information about the Scummvm-git-logs
mailing list