Changeset 1752

Timestamp:

05/06/10 12:05:29 (15 years ago)

Author:

Malte Marquarding

Message:

Merge from release branch to fix binary installer not including asap2to3

Files:

• tags/asap-3.0.0 (modified) (1 prop)
• tags/asap-3.0.0/apps/SConscript (modified) (1 diff)
• tags/asap-3.0.0/bin/install (modified) (1 diff)
• trunk (modified) (1 prop)
• trunk/apps/SConscript (modified) (1 diff)
• trunk/bin/install (modified) (1 diff)

tags/asap-3.0.0/apps/SConscript

@@ -18 +18 @@
     prog = myenv.Program(cpp)    
     installs.append(myenv.Install("$prefix/bin", prog))
+    if len(myenv["makedist"]):
+        myenv.QInstall("#/$stagedir/bin", prog)
+
 myenv.Alias('install', installs)

tags/asap-3.0.0/bin/install

@@ -149 +149 @@
         shutil.copy2("bin/asap", bindir)
     shutil.copy2("bin/asap_update_data", bindir)
+    shutil.copy2("bin/asap2to3", bindir)
     if not os.path.exists("asap/data/ephemerides"):
         print "Warning - no data directory present"

trunk/apps/SConscript

@@ -18 +18 @@
     prog = myenv.Program(cpp)    
     installs.append(myenv.Install("$prefix/bin", prog))
+    if len(myenv["makedist"]):
+        myenv.QInstall("#/$stagedir/bin", prog)
+
 myenv.Alias('install', installs)

trunk/bin/install

@@ -149 +149 @@
         shutil.copy2("bin/asap", bindir)
     shutil.copy2("bin/asap_update_data", bindir)
+    shutil.copy2("bin/asap2to3", bindir)
     if not os.path.exists("asap/data/ephemerides"):
         print "Warning - no data directory present"