[Jython-checkins] SF.net SVN: jython: [4943] branches/asm

[<fwi...@us...>]

Revision: 4943
          http://jython.svn.sourceforge.net/jython/?rev=4943&view=rev
Author:   fwierzbicki
Date:     2008-07-15 11:33:40 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
build tweaks + workaround for an NT problem in site.py

Modified Paths:
--------------
    branches/asm/Lib/site.py
    branches/asm/build.xml

Modified: branches/asm/Lib/site.py
===================================================================
--- branches/asm/Lib/site.py	2008-07-15 18:00:57 UTC (rev 4942)
+++ branches/asm/Lib/site.py	2008-07-15 18:33:40 UTC (rev 4943)
@@ -73,7 +73,9 @@
         if hasattr(m, '__loader__'):
             continue   # don't mess with a PEP 302-supplied __file__
         try:
-            m.__file__ = os.path.abspath(m.__file__)
+            #XXX: temp workaround while we figure out why this is None on NT.
+            if m.__file__ != None:
+                m.__file__ = os.path.abspath(m.__file__)
         except AttributeError:
             continue
 

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-07-15 18:00:57 UTC (rev 4942)
+++ branches/asm/build.xml	2008-07-15 18:33:40 UTC (rev 4943)
@@ -336,8 +336,8 @@
 
     <target name="checkout" depends="prepare" if="do.checkout">
         <svn javahl="${javahl.dir}" >
-            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${snapshot.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
-            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${snapshot.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
+            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
+            <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
         </svn> 
 
         <!-- checkout cpython license from the correct python maintenance branch -->
@@ -377,8 +377,8 @@
     <target name="brand-readme-version" depends="checkout" if="do.snapshot.build">
         <!-- change README.txt version string, if so defined: used for
         snapshot builds. XXX: a bit broken for now-->
-        <replace file="${jython.base.dir}/README.txt" token='2.2b2'
-        value='2.2b${snapshot.revision}' />
+        <replace file="${jython.base.dir}/README.txt" token='2.5a0+'
+        value='2.5a${svn.revision}' />
         <replace file="${jython.base.dir}/README.txt">
             <replacetoken>=======================</replacetoken>
             <replacevalue>--------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.