store the sparkle sources somewhere sensible

samizdatco · samizdatco · commit b0be9560cff9 · 2014-06-23T15:33:27.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -2,18 +2,13 @@
 *.pyc
 build/
 dist/
+app/deps/Sparkle*
 
 # cds garbage
-examples/*/*.pdf
-examples/*/*.png
-examples/*/*.jpg
-examples/*/*.gif
-examples/*/*.mov
-Resources/English.lproj/NodeBox\ Help/
 related/
 todo.txt
+test.py
 
 # Xcode user files
 project.xcworkspace
 xcuserdata
-test.py
diff --git a/setup.py b/setup.py
@@ -138,20 +138,21 @@ def run(self):
 
         # build the app
         self.spawn(['xcodebuild'])
+
+        # we don't need no stinking core dumps
         remove_tree(APP+'.dSYM')
-        remove_tree(APP+'/Contents/Resources/doc')
 
-        # Download Sparkle and make sure it's decompressed in the ./related dir
-        ORIG = 'related/Sparkle-%s/Sparkle.framework'%SPARKLE_VERSION
+        # Download Sparkle (if necessary) and copy it into the bundle
+        ORIG = 'app/deps/Sparkle-%s/Sparkle.framework'%SPARKLE_VERSION
         SPARKLE = join(APP,'Contents/Frameworks/Sparkle.framework')
         if not exists(ORIG):
             print "Downloading Sparkle.framework"
-            self.mkpath(join(TOP,'related'))
-            os.system('curl -L %s | bunzip2 -c | tar xf - -C related'%SPARKLE_URL)
+            self.mkpath(join(TOP,'app/deps'))
+            os.system('curl -L %s | bunzip2 -c | tar xf - -C app/deps'%SPARKLE_URL)
         self.mkpath(dirname(SPARKLE))
         self.spawn(['ditto', ORIG, SPARKLE])
 
-        # codesign using the most generic identity name possible
+        # code-sign the app and sparkle bundles, then verify
         self.spawn(['codesign', '-f', '-v', '-s', "Developer ID Application", SPARKLE])
         self.spawn(['codesign', '-f', '-v', '-s', "Developer ID Application", APP])
         self.spawn(['spctl', '--assess', '-v', 'dist/PlotDevice.app'])
@@ -243,11 +244,8 @@ def info_plist():
         },
     ))
 
-
     # py2app-specific config
     if BUILD_APP:
-
-
         config.update(dict(
             app = [{
                 'script': "app/plotdevice-app.py",
