#263 only include a copy of GNU FDL in export if that license is selected

git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3566 38b22f21-9aea-0310-abfc-843a9883df58

6 files changed, 17 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 9243a19..0ca0598 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 * Fix image gallery to allow captions containing apostrophes
 * Fix field IDs so that adding to a previously saved elp is consistent
 * Fix Common Cartridge manifest when a header image is used
+* Only include a copy of GNU FDL if that is the license selected
 * Re-enable loading of user extended iDevices from config directory
 * Translation updates
 
diff --git a/exe/export/imsexport.py b/exe/export/imsexport.py
index b94ae6d..fedc1c6 100644
--- a/exe/export/imsexport.py
+++ b/exe/export/imsexport.py
@@ -1,7 +1,7 @@
 # ===========================================================================
 # eXe 
 # Copyright 2004-2005, University of Auckland
-# Copyright 2004-2007 eXe Project, New Zealand Tertiary Education Commission
+# Copyright 2004-2008 eXe Project, http://eXeLearning.org/
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -351,8 +351,9 @@ class IMSExport(object):
             videofile = (self.templatesDir/'xspf_player.swf')
             videofile.copyfile(outputDir/'xspf_player.swf')
 
-        # Copy a copy of the GNU Free Documentation Licence
-        (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
+        if package.license == "GNU Free Documentation License":
+            # include a copy of the GNU Free Documentation Licence
+            (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
         # Zip it up!
         self.filename.safeSave(self.doZip, _('EXPORT FAILED!\nLast succesful export is %s.'), outputDir)
         # Clean up the temporary dir
diff --git a/exe/export/scormexport.py b/exe/export/scormexport.py
index b103a28..171e1ed 100644
--- a/exe/export/scormexport.py
+++ b/exe/export/scormexport.py
@@ -485,9 +485,10 @@ class ScormExport(object):
             videofile = (self.templatesDir/'xspf_player.swf')
             videofile.copyfile(outputDir/'xspf_player.swf')
 
-        # Copy a copy of the GNU Free Documentation Licence
         if self.scormType == "scorm1.2" or self.scormType == "scorm2004":
-            (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
+            if package.license == "GNU Free Documentation License":
+                # include a copy of the GNU Free Documentation Licence
+                (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
         # Zip it up!
         self.filename.safeSave(self.doZip, _('EXPORT FAILED!\nLast succesful export is %s.'), outputDir)
         # Clean up the temporary dir
diff --git a/exe/export/singlepage.py b/exe/export/singlepage.py
index 5aa28a7..78163e9 100644
--- a/exe/export/singlepage.py
+++ b/exe/export/singlepage.py
@@ -1,7 +1,7 @@
 # ===========================================================================
 # eXe 
 # Copyright 2004-2005, University of Auckland
-# Copyright 2004-2007 eXe Project, New Zealand Tertiary Education Commission
+# Copyright 2004-2008 eXe Project, http://eXeLearning.org/
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/exe/export/singlepageexport.py b/exe/export/singlepageexport.py
index a886659..0e45ed3 100644
--- a/exe/export/singlepageexport.py
+++ b/exe/export/singlepageexport.py
@@ -1,6 +1,7 @@
 # ===========================================================================
 # eXe 
 # Copyright 2004-2005, University of Auckland
+# Copyright 2004-2008 eXe Project, http://eXeLearning.org/
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -124,8 +125,9 @@ class SinglePageExport(object):
             videofile.copyfile(self.outputDir/'xspf_player.swf')
 
 
-        # copy a copy of the GNU Free Documentation Licence
-        (self.templatesDir/'fdl.html').copyfile(self.outputDir/'fdl.html')
+        if package.license == "GNU Free Documentation License":
+            # include a copy of the GNU Free Documentation Licence
+            (self.templatesDir/'fdl.html').copyfile(self.outputDir/'fdl.html')
 
 
 # ===========================================================================
diff --git a/exe/export/websiteexport.py b/exe/export/websiteexport.py
index 910d6b9..1f15703 100644
--- a/exe/export/websiteexport.py
+++ b/exe/export/websiteexport.py
@@ -1,7 +1,7 @@
 # ===========================================================================
 # eXe 
 # Copyright 2004-2005, University of Auckland
-# Copyright 2004-2007 eXe Project, New Zealand Tertiary Education Commission
+# Copyright 2004-2008 eXe Project, http://eXeLearning.org/
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -187,9 +187,9 @@ class WebsiteExport(object):
             videofile = (self.templatesDir/'xspf_player.swf')
             videofile.copyfile(outputDir/'xspf_player.swf')
 
-                                    
-        # copy a copy of the GNU Free Documentation Licence
-        (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
+        if package.license == "GNU Free Documentation License":
+            # include a copy of the GNU Free Documentation Licence
+            (self.templatesDir/'fdl.html').copyfile(outputDir/'fdl.html')
 
 
     def generatePages(self, node, depth):