[X10-commits] SF.net SVN: x10:[14695] trunk

[<ipe...@us...>]

Revision: 14695
          http://x10.svn.sourceforge.net/x10/?rev=14695&view=rev
Author:   ipeshansky
Date:     2010-06-27 19:02:09 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Move the X10 bytecode backend work from the trunk to the x10-bytecode-backend branch.

Modified Paths:
--------------
    trunk/x10.compiler/META-INF/MANIFEST.MF
    trunk/x10.compiler/build.xml

Removed Paths:
-------------
    trunk/x10.compiler/src/x10bc/
    trunk/x10.dist/bin/x10bc

Modified: trunk/x10.compiler/META-INF/MANIFEST.MF
===================================================================
--- trunk/x10.compiler/META-INF/MANIFEST.MF	2010-06-27 18:30:58 UTC (rev 14694)
+++ trunk/x10.compiler/META-INF/MANIFEST.MF	2010-06-27 19:02:09 UTC (rev 14695)
@@ -23,7 +23,6 @@
  x10.util,
  x10.util.synthesizer,
  x10.visit,
- x10bc,
  x10cpp,
  x10cpp.ast,
  x10cpp.debug,

Modified: trunk/x10.compiler/build.xml
===================================================================
--- trunk/x10.compiler/build.xml	2010-06-27 18:30:58 UTC (rev 14694)
+++ trunk/x10.compiler/build.xml	2010-06-27 19:02:09 UTC (rev 14695)
@@ -15,13 +15,11 @@
     <property name="config" value="*.cfg"/>
     <property name="lpg.jar" value="lpg.jar"/>
     <property name="polyglot.jar" value="polyglot3.jar"/>
-    <property name="polyglot.bytecode.jar" value="polyglot-bytecode.jar"/>
     <property name="asm.jar" value="asm.jar"/>
     <path id="project.classpath">
         <path refid="mainproject.classpath"/>
         <path refid="lpg.classpath"/>
         <path refid="polyglot.classpath"/>
-        <path refid="polyglot.bytecode.classpath"/>
         <path refid="asm.classpath"/>
         <path refid="x10.constraints.classpath"/>
         <path refid="x10.common.classpath"/>
@@ -35,9 +33,6 @@
     <path id="polyglot.classpath">
         <pathelement location="${lib}/${polyglot.jar}"/>
     </path>
-    <path id="polyglot.bytecode.classpath">
-        <pathelement location="${lib}/${polyglot.bytecode.jar}"/>
-    </path>
     <path id="asm.classpath">
         <pathelement location="${lib}/${asm.jar}"/>
     </path>
@@ -67,7 +62,7 @@
         </copy>
     </target>
     <target name="check-jar" depends="init">
-        <fileset id="compiler.classes" dir="${build}" includes="org/**,x10/**,x10bc/**,x10cpp/**,x10c/**,x10cuda/**,data/**" excludes="${jar}"/>
+        <fileset id="compiler.classes" dir="${build}" includes="org/**,x10/**,x10cpp/**,x10c/**,x10cuda/**,data/**" excludes="${jar}"/>
         <fileset id="constraints.classes" dir="${x10.constraints.location}/classes" includes="x10/constraint/**" excludes="x10/constraint/test/**"/>
         <fileset id="common.classes" dir="${x10.common.location}/classes" includes="x10/**"/>
         <uptodate property="compiler.uptodate" targetfile="${build}/${jar}">
@@ -82,7 +77,7 @@
             <fileset refid="compiler.classes"/>
             <fileset refid="constraints.classes"/>
             <fileset refid="common.classes"/>
-            <!--<fileset dir="${build}" includes="org/**,x10/**,x10bc/**,x10cpp/**,x10c/**,x10cuda/**,data/**" excludes="${jar}"/>-->
+            <!--<fileset dir="${build}" includes="org/**,x10/**,x10cpp/**,x10c/**,x10cuda/**,data/**" excludes="${jar}"/>-->
             <!--<fileset dir="${x10.constraints.location}/classes" includes="x10/constraint/**" excludes="x10/constraint/test/**"/>-->
             <!--<fileset dir="${x10.common.location}/classes" includes="x10/**"/>-->
         </jar>
@@ -99,7 +94,7 @@
     </target>
     <target name="build" depends="init,prereq-jars">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac destdir="${build}" source="1.5" target="1.5" debug="on" includes="x10/**,x10bc/**,x10c/**,x10cpp/**,x10cuda/**" excludes="polyglot/ext/x10/dom/**,polyglot/ext/x10/plugin/**,polyglot/ext/x10/visit/Propagate*AnnotationsVisitor.java">
+        <javac destdir="${build}" source="1.5" target="1.5" debug="on" includes="x10/**,x10c/**,x10cpp/**,x10cuda/**" excludes="polyglot/ext/x10/dom/**,polyglot/ext/x10/plugin/**,polyglot/ext/x10/visit/Propagate*AnnotationsVisitor.java">
             <src path="${src}"/>
             <classpath refid="project.classpath"/>
         </javac>

Deleted: trunk/x10.dist/bin/x10bc
===================================================================
--- trunk/x10.dist/bin/x10bc	2010-06-27 18:30:58 UTC (rev 14694)
+++ trunk/x10.dist/bin/x10bc	2010-06-27 19:02:09 UTC (rev 14695)
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# If X10_FROM_SRC is set in your environment, then
-# this script will default to using paths that assume
-# the standard X10 developer setup and a desire to build from source.  
-# If it is not set, then the script will use paths that are 
-# appropriate for a pre-built distribution of x10. 
-
-UNAME=`uname -s`
-FILE_SEP='/'; if [[ "$UNAME" = CYGWIN* ]]; then FILE_SEP='\\'; fi
-PATH_SEP=':'; if [[ "$UNAME" = CYGWIN* ]]; then PATH_SEP=';'; fi
-
-prog=$(readlink $0 2>&1)
-[ $? -eq 127 -o "$prog" = "" ] && prog="$0"
-export X10_DIST="$(cd "$(dirname "$prog")/.." && pwd)"
-if [[ "$UNAME" = CYGWIN* ]]; then X10_DIST="$(cygpath -aw "$X10_DIST")"; fi
-
-[ -z "$X10SOURCES" ] && export X10SOURCES="${X10_DIST}/lib/x10.jar"
-
-export CP_OVERRIDE="${X10_DIST}${FILE_SEP}lib${FILE_SEP}x10c.jar${PATH_SEP}${X10_DIST}${FILE_SEP}classes${PATH_SEP}"
-export DEXT="x10bc.ExtensionInfo"
-
-exec "${X10_DIST}/bin/x10c" "$@"
-


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