Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-06-12 18:27:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-06-12 19:10:00 (GMT) |
| commit | 0745a0103e1f855c696b2f69ee2dea509b74bb01 (patch) | |
| tree | 47fd56ce9c2d81e83d14cc4943c0d6fb6641998b /Swift | |
| parent | 3fdc3e05ba0703b4eca764b9b93931ccd8bd71e1 (diff) | |
| download | swift-contrib-0745a0103e1f855c696b2f69ee2dea509b74bb01.zip swift-contrib-0745a0103e1f855c696b2f69ee2dea509b74bb01.tar.bz2 | |
Create amalgamation of COPYING file.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/SConscript | 6 | ||||
| -rw-r--r-- | Swift/QtUI/Swift.qrc | 2 |
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 @@ -40,18 +40,19 @@ if myenv.get("HAVE_SNARL", False) : myenv.UseFlags(myenv["SNARL_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_SNARL"]) if env["PLATFORM"] == "win32" : myenv.Append(LIBS = ["cryptui"]) 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"] myenv.EnableQt4Modules(qt4modules, debug = False) myenv.Append(CPPPATH = ["."]) if env["PLATFORM"] == "win32" : #myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"] @@ -198,18 +199,21 @@ myenv.Uic4("QtAffiliationEditor.ui") myenv.Uic4("QtJoinMUCWindow.ui") myenv.Qrc("DefaultTheme.qrc") myenv.Qrc("Swift.qrc") # Resources 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 ################################################################################ # Collect available languages translation_languages = [] for file in os.listdir(Dir("#/Swift/Translations").abspath) : if file.startswith("swift_") and file.endswith(".ts") : translation_languages.append(file[6:-3]) @@ -303,19 +307,19 @@ if env["PLATFORM"] == "win32" : # The correct way is \u<decimal utf16 point>? , but this is more # work outfile.write("\\'%X" % ord(char)) else : outfile.write(char) outfile.write('\\par ') 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", # FIXME: Not including patch version, but that shouldn't be # a problem. It just allows downgrading between development versions 'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + ".0" } wixincludecontent = "<Include>" for key in wixvariables: 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 @@ -13,12 +13,12 @@ <file alias="icons/error.png">../resources/icons/error.png</file> <file alias="icons/warn.png">../resources/icons/warn.png</file> <file alias="icons/check.png">../resources/icons/check.png</file> <file alias="icons/throbber.gif">../resources/icons/throbber.gif</file> <file alias="icons/avatar.png">../resources/icons/avatar.png</file> <file alias="icons/no-avatar.png">../resources/icons/no-avatar.png</file> <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> |