Changeset 21

Show
Ignore:
Timestamp:
01/18/07 10:36:01 (2 years ago)
Author:
dc12360
Message:

Minor changes to build and README

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ProjectFortress/.classpath

    r8 r21  
    22<classpath> 
    33        <classpathentry kind="src" path="src"/> 
     4        <classpathentry kind="lib" path="third_party/xtc/xtc.jar"/> 
    45        <classpathentry kind="lib" path="third_party/FJ/concurrent.jar"/> 
     6        <classpathentry kind="lib" path="third_party/dstm2/dstm2.jar"/> 
     7        <classpathentry kind="lib" path="third_party/bcel/bcel-5.2.jar"/> 
    58        <classpathentry kind="lib" path="third_party/junit/junit.jar"/> 
    6         <classpathentry kind="lib" path="third_party/xtc/xtc.jar"/> 
    79        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    810        <classpathentry kind="output" path="build"/> 

  • trunk/ProjectFortress/README

    r20 r21  
    184184 
    185185* The "atomic" construct uses the DSTM2 transactional memory library. 
     186  Nested transactions are flattened.  We use their obstruction free algorithm  
     187  with a simple backoff contention manager.  Reductions are not yet  
     188  implemented, so perform an explicit atomic update instead. 
    186189 
    187190LANGUAGE FEATURES THAT ARE NOT IMPLEMENTED 
    …… 
    217220 
    218221* throw and catch 
     222 
     223* General sequential for loops 
    219224 
    220225* Generators and reduction variables 

  • trunk/ProjectFortress/ant

    r19 r21  
    3131fi 
    3232 
    33 # IF YOU UPDATE THIS CLASSPATH, 
    34 # BE SURE TO UPDATE THE CLASSPATH EVERYWHERE (MORE THAN JUST ONCE)  
    35 # IT OCCURS IN build.xml.  FAILURE TO OBSERVE THIS SIMPLE RULE BREAKS 
    36 # ANT-IDE INTEGRATION. 
    37 if [ "$EXPLICIT_ANT_ARGS" == "" ] ; then 
    38   EXPLICIT_ANT_ARGS="-noclasspath -lib \"third_party/ant:third_party/xtc:third_party/junit:third_party/fj:third_party/dstm2:third_party/bcel:build\"" 
    39 fi 
    40  
    41 export ANT_ARGS=$EXPLICIT_ANT_ARGS 
    42 export ANT_OPTS="-Xmx384M -Xms256M -XX:+UseParallelGC" # -verbosegc" # -XX:+PrintGCDetails" 
    43 export ANT_CALLED_FROM_SCRIPT="yes" 
    44  
    45 echo Using Ant args $ANT_ARGS 
    46  
    47 $ANT_HOME/bin/ant $ANT_ARGS $* 
     33# 
     34# For NetBeans, you should not need to adjust anything to 
     35# build and test Fortress. 
     36# 
     37# For Eclipse, workspace and ant builds should not require any 
     38# adjustments, but to run tests using ant within Eclipse, you 
     39# will need to add junit.jar to 
     40# build.xml -> Run As -> Ant Build... -> Classpath -> User Entries -> Add JARs... 
     41# 
     42$ANT_HOME/bin/ant -noclasspath -lib third_party/junit "$@" 

  • trunk/ProjectFortress/build.xml

    r19 r21  
    4141    <property name="build.classpath" location="${build}"/> 
    4242    <property name="precedence" location="${parser}/precedence"/> 
     43    <property name="junit" location="${basedir}/third_party/junit"/> 
     44    <property name="compile.classpath" value="${build.classpath}:${xtc}/xtc.jar:${fj}/concurrent.jar:${dstm2}/dstm2.jar:${bcel}/bcel-5.2.jar:${junit}/junit.jar"/> 
    4345    <property environment="env"/> 
    4446 
    …… 
    224226            source="1.5" 
    225227            debug="true" 
    226             classpath="${build.classpath}:${xtc}/xtc.jar:${fj}/concurrent.jar:${dstm2}/dstm2.jar:${bcel}/bcel-5.2.jar"> 
     228            classpath="${compile.classpath}"> 
    227229            <!-- Uncomment the following line to print unchecked warnings 
    228230                 (here and in the 'compileCommon' target. --> 
    …… 
    245247            source="1.5" 
    246248            debug="true" 
    247             classpath="${build.classpath}:${xtc}/xtc.jar:${fj}/concurrent.jar:${dstm2}/dstm2.jar:${bcel}/bcel-5.2.jar"> 
     249            classpath="${compile.classpath}"> 
    248250 
    249251            <!-- Uncomment the following line to print unchecked warnings