[Scummvm-git-logs] scummvm-tools master -> 3fe34dd38c34e13f08a069e25077558b89125805

aquadran noreply at scummvm.org
Sun May 29 06:59:37 UTC 2022


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

Summary:
3fe34dd38c ALL: Added licenses to distribution


Commit: 3fe34dd38c34e13f08a069e25077558b89125805
    https://github.com/scummvm/scummvm-tools/commit/3fe34dd38c34e13f08a069e25077558b89125805
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-05-29T08:59:34+02:00

Commit Message:
ALL: Added licenses to distribution

Changed paths:
    Makefile
    dists/win32/ScummVM Tools.iss
    dists/win32/scummvm-tools.nsi
    dists/win32/scummvm-tools.nsi.in


diff --git a/Makefile b/Makefile
index 36d4c32..03798ec 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,8 @@ endif
 	$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-cli$(EXEEXT)
 	cp $(srcdir)/*.bat $(WIN32PATH)/tools
 	cp $(srcdir)/COPYING $(WIN32PATH)/tools/COPYING.txt
+	cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/tools/COPYING_LGPL.txt
+	cp $(srcdir)/COPYING.LUA $(WIN32PATH)/tools/COPYING_LUA.txt
 	cp $(srcdir)/README $(WIN32PATH)/tools/README.txt
 	cp $(srcdir)/NEWS $(WIN32PATH)/tools/NEWS.txt
 	cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
@@ -146,6 +148,8 @@ WIN32BUILD=build
 win32setup: all
 	mkdir -p $(srcdir)/$(WIN32BUILD)
 	cp $(srcdir)/COPYING          $(srcdir)/$(WIN32BUILD)
+	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(WIN32BUILD)
+	cp $(srcdir)/COPYING.LUA      $(srcdir)/$(WIN32BUILD)
 	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32BUILD)
 	cp $(srcdir)/README           $(srcdir)/$(WIN32BUILD)
 	unix2dos $(srcdir)/$(WIN32BUILD)/*.*
@@ -245,6 +249,8 @@ bundle: scummvm-tools-static
 osxsnap: bundle scummvm-tools-cli-static
 	mkdir ScummVM-Tools-snapshot
 	cp $(srcdir)/COPYING ./ScummVM-Tools-snapshot/License\ \(GPL\)
+	cp $(srcdir)/COPYING.LGPL ./ScummVM-Tools-snapshot/License\ \(LGPL\)
+	cp $(srcdir)/COPYING.LUA ./ScummVM-Tools-snapshot/License\ \(LUA\)
 	cp $(srcdir)/NEWS ./ScummVM-Tools-snapshot/News
 	cp $(srcdir)/README ./ScummVM-Tools-snapshot/ScummVM\ ReadMe
 	$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-Tools-snapshot/*
@@ -325,6 +331,8 @@ riscosdist: all riscosboot $(addprefix !ScummTool/bin/,$(addsuffix $(,)ff8,$(PRO
 	cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummTool/!Sprites11,ff9
 	cp $(srcdir)/README !ScummTool/!Help,fff
 	cp $(srcdir)/COPYING !ScummTool/COPYING,fff
+	cp $(srcdir)/COPYING.LGPL !ScummTool/COPYING.LGPL,fff
+	cp $(srcdir)/COPYING.LUA !ScummTool/COPYING.LUA,fff
 	cp $(srcdir)/NEWS !ScummTool/NEWS,fff
 ifeq "$(USE_WXWIDGETS)" "1"
 	mkdir -p !ScummTool/bin/media
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index 2aeb964..b62d435 100755
--- a/dists/win32/ScummVM Tools.iss	
+++ b/dists/win32/ScummVM Tools.iss	
@@ -25,6 +25,8 @@ WizardImageFile=graphics\left.bmp
 Source: "tools\construct_mohawk.exe"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "tools\convert_dxa.bat"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "tools\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion  
+Source: "tools\COPYING_LGPL.txt"; DestDir: "{app}"; Flags: ignoreversion  
+Source: "tools\COPYING_LUA.txt"; DestDir: "{app}"; Flags: ignoreversion  
 Source: "tools\create_sjisfnt.exe"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "tools\decine.exe"; DestDir: "{app}"; Flags: ignoreversion 
 Source: "tools\degob.exe"; DestDir: "{app}"; Flags: ignoreversion 
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
index a2ce1e8..20f266a 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -223,6 +223,8 @@ Section "ScummVM" SecMain
 
 	# Text files
 	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=COPYING_LGPL.txt "${text_dir}\COPYING.LGPL"
+	File /oname=COPYING_LUA.txt  "${text_dir}\COPYING.LUA"
 	File /oname=NEWS.txt         "${text_dir}\NEWS"
 	File /oname=README.txt       "${text_dir}\README"
 
@@ -300,6 +302,8 @@ FunctionEnd
 #########################################################################################
 Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\COPYING_LGPL.txt
+	Delete /REBOOTOK $INSTDIR\COPYING_LUA.txt
 	Delete /REBOOTOK $INSTDIR\NEWS.txt
 	Delete /REBOOTOK $INSTDIR\README.txt
 
diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in
index 257ba35..34a2850 100644
--- a/dists/win32/scummvm-tools.nsi.in
+++ b/dists/win32/scummvm-tools.nsi.in
@@ -223,6 +223,8 @@ Section "ScummVM" SecMain
 
 	# Text files
 	File /oname=COPYING.txt      "${text_dir}\COPYING"
+	File /oname=COPYING_LGPL.txt "${text_dir}\COPYING.LGPL"
+	File /oname=COPYING_LUA.txt  "${text_dir}\COPYING.LUA"
 	File /oname=NEWS.txt         "${text_dir}\NEWS"
 	File /oname=README.txt       "${text_dir}\README"
 
@@ -300,6 +302,8 @@ FunctionEnd
 #########################################################################################
 Section -un.Main SecUninstall
 	Delete /REBOOTOK $INSTDIR\COPYING.txt
+	Delete /REBOOTOK $INSTDIR\COPYING_LGPL.txt
+	Delete /REBOOTOK $INSTDIR\COPYING_LUA.txt
 	Delete /REBOOTOK $INSTDIR\NEWS.txt
 	Delete /REBOOTOK $INSTDIR\README.txt
 




More information about the Scummvm-git-logs mailing list