summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-06-12 18:27:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-06-12 19:10:00 (GMT)
commit0745a0103e1f855c696b2f69ee2dea509b74bb01 (patch)
tree47fd56ce9c2d81e83d14cc4943c0d6fb6641998b /Swift
parent3fdc3e05ba0703b4eca764b9b93931ccd8bd71e1 (diff)
downloadswift-contrib-0745a0103e1f855c696b2f69ee2dea509b74bb01.zip
swift-contrib-0745a0103e1f855c696b2f69ee2dea509b74bb01.tar.bz2
Create amalgamation of COPYING file.
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/SConscript6
-rw-r--r--Swift/QtUI/Swift.qrc2
2 files changed, 6 insertions, 2 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 042e2a0..39f7464 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -46,6 +46,7 @@ myenv.UseFlags(myenv["PLATFORM_FLAGS"])
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("wix", toolpath = ["#/BuildTools/SCons/Tools"])
+myenv.Tool("textfile", toolpath = ["#/BuildTools/SCons/Tools"])
qt4modules = ['QtCore', 'QtGui', 'QtWebKit']
if env["PLATFORM"] == "posix" :
qt4modules += ["QtDBus"]
@@ -204,6 +205,9 @@ commonResources = {
"": ["#/Swift/resources/sounds"]
}
+myenv["TEXTFILESUFFIX"] = ""
+myenv.MyTextfile(target = "COPYING", source = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty")], LINESEPARATOR = "\n\n========\n\n\n")
+
################################################################################
# Translation
################################################################################
@@ -309,7 +313,7 @@ if env["PLATFORM"] == "win32" :
outfile.write('}')
outfile.close()
infile.close()
- env.Command(["Swift/COPYING.rtf"], ["../../COPYING"], convertToRTF)
+ env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF)
wixvariables = {
'VCCRTFile': env.get("vcredist", "c:\\Program Files\\Common Files\\Merge Modules") + "\\Microsoft_VC90_CRT_x86.msm",
diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc
index 61d8cc0..99409fa 100644
--- a/Swift/QtUI/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc
@@ -19,6 +19,6 @@
<file alias="icons/tray-standard.png">../resources/icons/tray-standard.png</file>
<file alias="icons/new-chat.png">../resources/icons/new-chat.png</file>
<file alias="icons/actions.png">../resources/icons/actions.png</file>
- <file alias="COPYING">../../COPYING</file>
+ <file alias="COPYING">COPYING</file>
</qresource>
</RCC>