summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-10-01 13:21:18 +0200
committerEike Ziller <eike.ziller@digia.com>2014-10-09 11:41:44 +0200
commit8295b503be90c60a8a7e9b722357352917406078 (patch)
tree57efd651b9034fefbd2a37fec82bdc36649f8900 /scripts
parent1546afd0e36923f7e52384b664796cffd95a3cc2 (diff)
downloadqt-creator-8295b503be90c60a8a7e9b722357352917406078.tar.gz
License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/hasCopyright.pl3
-rwxr-xr-xscripts/makedmg.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/hasCopyright.pl b/scripts/hasCopyright.pl
index 3f7d4dc622..ee68f3baff 100644
--- a/scripts/hasCopyright.pl
+++ b/scripts/hasCopyright.pl
@@ -23,7 +23,8 @@ sub canIgnoreNoCopyright {
$file =~ /\.qrc$/ or
$file =~ /\.txt$/i or
$file =~ /\/README[^\/]*$/i or
- $file =~ /\/LICENSE.LGPL$/i or
+ $file =~ /\/LICENSE.LGPLv21$/i or
+ $file =~ /\/LICENSE.LGPLv3$/i or
$file =~ /\.ui$/i or
$file =~ /\.xml$/ or
$file =~ /\.css$/ or
diff --git a/scripts/makedmg.sh b/scripts/makedmg.sh
index 15c6492f47..42e2504824 100755
--- a/scripts/makedmg.sh
+++ b/scripts/makedmg.sh
@@ -10,7 +10,8 @@ title="Qt Creator"
echo Preparing image artifacts...
cp -a "${sourceFolder}/" "${intermediateFolder}"
ln -s /Applications "${intermediateFolder}"
-cp "$(dirname "${BASH_SOURCE[0]}")/../LICENSE.LGPL" "${intermediateFolder}/LICENSE_LGPL.txt"
+cp "$(dirname "${BASH_SOURCE[0]}")/../LICENSE.LGPLv21" "${intermediateFolder}/LICENSE_LGPLv21.txt"
+cp "$(dirname "${BASH_SOURCE[0]}")/../LICENSE.LGPLv3" "${intermediateFolder}/LICENSE_LGPLv3.txt"
echo Creating image...
hdiutil create -srcfolder "${intermediateFolder}" -volname "${title}" -format UDBZ "${finalDMGName}" -ov -scrub -size 1g -verbose
# make sure that the image is umounted etc