Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-02-24 17:02:28 (GMT)
committerTobias Markmann <tm@ayena.de>2017-02-24 17:02:28 (GMT)
commitabd81d4a3cf08ffaa1e5265d204cdd80c8c0583b (patch)
tree9692a924e7a29c36c3342401c72b12be0e24685a
parentad463f276f11192fcd6ab9a00fffba2b3cca6761 (diff)
downloadswift-abd81d4a3cf08ffaa1e5265d204cdd80c8c0583b.zip
swift-abd81d4a3cf08ffaa1e5265d204cdd80c8c0583b.tar.bz2
Add Sparkle license to about dialog COPYING file on demand
If scons detects a Sparkle release in the 3rdParty folder, it will add the containing LICENSE file at the end of the dynamically generated COPYING file. Test-Information: Tested that the contents of Sparkle’s LICENSE file are at the end of the text in the license window of the about dialog, if the Sparkle folder, with a Sparkle release inside, is present in 3rdParty. Tested that Swift builds fine, if the Sparkle folder is missing in 3rdParty. Change-Id: I89db155b5bb3eef4d632997fd99ff270b4720a16
Diffstat
-rw-r--r--BuildTools/SCons/SConstruct1
-rw-r--r--Swift/QtUI/SConscript8
2 files changed, 8 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index c084cff..a7e2bed 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -272,60 +272,61 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"]
"LIBS": gconf_bare_env["LIBS"],
"CCFLAGS": gconf_bare_env["CCFLAGS"],
"CPPPATH": gconf_bare_env["CPPPATH"],
"CPPDEFINES": gconf_bare_env.get("CPPDEFINES", []),
}
gconf_env.MergeFlags(gconf_flags)
if conf.CheckCHeader("gconf/gconf-client.h") and conf.CheckLib("gconf-2") :
env["HAVE_GCONF"] = 1
env["GCONF_FLAGS"] = {
"LIBS": gconf_env["LIBS"],
"CCFLAGS": gconf_env["CCFLAGS"],
"CPPPATH": gconf_env["CPPPATH"],
"CPPDEFINES": gconf_env.get("CPPDEFINES", []),
}
conf.Finish()
# Sparkle
env["HAVE_SPARKLE"] = 0
if env["PLATFORM"] == "darwin" :
sparkle_flags = {
"FRAMEWORKPATH": ["3rdParty/Sparkle/Sparkle-1.14.0"],
"FRAMEWORKS": ["Sparkle"]
}
sparkle_env = conf_env.Clone()
sparkle_env.MergeFlags(sparkle_flags)
conf = Configure(sparkle_env, custom_tests = { "CheckObjCHeader" : checkObjCHeader })
if conf.CheckObjCHeader("Sparkle/Sparkle.h") :
env["HAVE_SPARKLE"] = 1
env["SPARKLE_FLAGS"] = sparkle_flags
env["SPARKLE_FRAMEWORK"] = Dir("../../3rdParty/Sparkle/Sparkle-1.14.0/Sparkle.framework")
+ env["SPARKLE_COPYING"] = File("../../3rdParty/Sparkle/Sparkle-1.14.0/LICENSE")
conf.Finish()
if env.get("sparkle_public_dsa_key", None) != None :
env["SWIFT_SPARKLE_PUBLIC_DSA_KEY"] = File(env.get("sparkle_public_dsa_key"))
else :
env["SWIFT_SPARKLE_PUBLIC_DSA_KEY"] = None
# Growl
env["HAVE_GROWL"] = 0
if env["PLATFORM"] == "darwin" :
growl_flags = {
"FRAMEWORKPATH": ["/Library/Frameworks"],
"FRAMEWORKS": ["Growl"]
}
growl_env = conf_env.Clone()
growl_env.MergeFlags(growl_flags)
conf = Configure(growl_env, custom_tests = { "CheckObjCHeader" : checkObjCHeader })
if conf.CheckObjCHeader("Growl/Growl.h") :
env["HAVE_GROWL"] = 1
env["GROWL_FLAGS"] = growl_flags
env["GROWL_FRAMEWORK"] = "/Library/Frameworks/Growl.framework"
conf.Finish()
# LibXML
conf = Configure(conf_env, custom_tests = {"CheckVersion": CheckVersion})
if env.get("try_libxml", True) and conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") :
#and conf.CheckVersion("LibXML", "2.6.23", "LIBXML_VERSION", "libxml/xmlversion.h", 20623) :
env["HAVE_LIBXML"] = 1
env["LIBXML_FLAGS"] = { "LIBS": ["xml2"] }
conf.Finish()
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 8a39063..3512120 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -299,62 +299,68 @@ if env["PLATFORM"] != "darwin" and env["PLATFORM"] != "win32" :
openURIProgram = myenv.Program("swift-open-uri", "swift-open-uri.cpp")
else :
openURIProgram = []
myenv.Uic4("MUCSearch/QtMUCSearchWindow.ui")
myenv.Uic4("UserSearch/QtUserSearchWizard.ui")
myenv.Uic4("UserSearch/QtUserSearchFirstPage.ui")
myenv.Uic4("UserSearch/QtUserSearchFirstMultiJIDPage.ui")
myenv.Uic4("UserSearch/QtUserSearchFieldsPage.ui")
myenv.Uic4("UserSearch/QtUserSearchResultsPage.ui")
myenv.Uic4("QtBookmarkDetailWindow.ui")
myenv.Uic4("QtAffiliationEditor.ui")
myenv.Uic4("QtJoinMUCWindow.ui")
myenv.Uic4("QtHistoryWindow.ui")
myenv.Uic4("QtConnectionSettings.ui")
myenv.Uic4("QtHighlightEditor.ui")
myenv.Uic4("QtBlockListEditorWindow.ui")
myenv.Uic4("QtSpellCheckerWindow.ui")
myenv.Uic4("QtUpdateFeedSelectionDialog.ui")
myenv.Qrc("DefaultTheme.qrc")
myenv.Qrc("Swift.qrc")
if env["PLATFORM"] == "win32" :
myenv.Qrc("SwiftWindows.qrc")
# Resources
commonResources = {
"": ["#/Swift/resources/sounds"]
}
+
+## COPYING file generation
myenv["TEXTFILESUFFIX"] = ""
-myenv.MyTextfile(target = "COPYING", source = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty"), myenv.File("../../COPYING.dependencies")], LINESEPARATOR = "\n\n========\n\n\n")
+
+copying_files = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty"), myenv.File("../../COPYING.dependencies")]
+if env["PLATFORM"] == "darwin" and env["HAVE_SPARKLE"] :
+ copying_files.append(env["SPARKLE_COPYING"])
+myenv.MyTextfile(target = "COPYING", source = copying_files, 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])
# Generate translation modules
translation_sources = [env.File("#/Swift/Translations/swift.ts").abspath]
translation_modules = []
for lang in translation_languages :
translation_resource = "#/Swift/resources/translations/swift_" + lang + ".qm"
translation_source = "#/Swift/Translations/swift_" + lang + ".ts"
translation_sources.append(env.File(translation_source).abspath)
translation_modules.append(env.File(translation_resource).abspath)
myenv.Qm(translation_resource, translation_source)
commonResources["translations"] = commonResources.get("translations", []) + [translation_resource]
# LUpdate translation (if requested)
if ARGUMENTS.get("update_translations", False) :
myenv.Precious(translation_sources)
remove_obsolete_option = ""
codecfortr = ""
if ARGUMENTS.get("remove_obsolete_translations", False) :
remove_obsolete_option = " -no-obsolete"
if qt_version == '4':