Menu
▾
▴
[X10-commits] SF.net SVN: x10:[10974] trunk
|
From: <dgr...@us...> - 2009-08-13 15:29:55
|
Revision: 10974
http://x10.svn.sourceforge.net/x10/?rev=10974&view=rev
Author: dgrove-oss
Date: 2009-08-13 15:29:43 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Merge the the x10.cppbackend.17 project into x10.compiler.
Modified Paths:
--------------
trunk/x10.compiler/build.xml
trunk/x10.dist/bin/x10c++
trunk/x10.dist/build.xml
trunk/x10.dist/releng/exportRelease.sh
trunk/x10.runtime/src-cpp/Makefile
trunk/x10.tests/bin/buildScript++
trunk/x10.tests/bin/buildScriptCT++
Added Paths:
-----------
trunk/x10.compiler/data/MainMP.xcd
trunk/x10.compiler/src/polyglot/ext/x10cpp/
trunk/x10.compiler/src/polyglot/ext/x10cuda/
trunk/x10.compiler/src/x10c/
trunk/x10.dist/.launchConfigs/x10cpp.launch
Removed Paths:
-------------
trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch
trunk/x10.cppbackend.17/data/Main.xcd
trunk/x10.cppbackend.17/data/MainMP.xcd
trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/
trunk/x10.cppbackend.17/src/polyglot/ext/x10cuda/
trunk/x10.cppbackend.17/src/x10c/
Modified: trunk/x10.compiler/build.xml
===================================================================
--- trunk/x10.compiler/build.xml 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.compiler/build.xml 2009-08-13 15:29:43 UTC (rev 10974)
@@ -66,7 +66,7 @@
</target>
<target name="jar" depends="build">
<jar jarfile="${build}/${jar}">
- <fileset dir="${build}" includes="org/**,polyglot/ext/x10/**,x10/parser/**,x10/emitter/**,x10/utils/**,data/**" excludes="${jar}"/>
+ <fileset dir="${build}" includes="org/**,polyglot/ext/x10/**,polyglot/ext/x10cpp/**,x10/parser/**,x10/emitter/**,x10/utils/**,x10c/**,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>
Copied: trunk/x10.compiler/data/MainMP.xcd (from rev 10973, trunk/x10.cppbackend.17/data/MainMP.xcd)
===================================================================
--- trunk/x10.compiler/data/MainMP.xcd (rev 0)
+++ trunk/x10.compiler/data/MainMP.xcd 2009-08-13 15:29:43 UTC (rev 10974)
@@ -0,0 +1,9 @@
+// SYNOPSIS: #0.main(...)
+
+##include <x10/runtime/Runtime.h>
+##include <x10aux/bootstrap.h>
+extern "C" { int main(int ac, char **av) { return x10aux::template_main<x10::runtime::Runtime,#0 >(ac,av); } }
+
+
+// the original app-main method
+
Deleted: trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch
===================================================================
--- trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch 2009-08-13 15:29:43 UTC (rev 10974)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="polyglot.ext.x10cpp.main.Main"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="x10.backend" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.cppbackend.17" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="lpg.runtime.java" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.compiler" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.constraints" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.common" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="polyglot3" type="1"/> "/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ext x10cpp ${resource_loc} -sourcepath ${project_loc:x10.runtime}/src-x10 -noserial -assert -d out -disable CheckNativeAnnotations -commandlineonly ${project_loc:x10.tests}/examples/x10lib/harness/x10Test.x10"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="x10.cppbackend.17"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="X10LIB" value="${project_loc:x10.cppbackend.17}/../pgas/common/work"/>
-<mapEntry key="X10LANG" value="${project_loc:x10.runtime}/src-cpp"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${container_loc}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-</launchConfiguration>
Deleted: trunk/x10.cppbackend.17/data/Main.xcd
===================================================================
--- trunk/x10.cppbackend.17/data/Main.xcd 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.cppbackend.17/data/Main.xcd 2009-08-13 15:29:43 UTC (rev 10974)
@@ -1,26 +0,0 @@
-// SYNOPSIS: #0.main(...)
-
-extern "C" {
- int main(int ac, char **av) {
- ref<Rail<x10aux::ref<String> > > args = x10aux::convert_args(ac, av);
- try {
- x10::runtime::Runtime::start(
- new (x10aux::alloc<VoidFun>(sizeof(BootStrapClosure)))
- x10aux::BootStrapClosure(#0::main,args) );
- } catch(int exitCode) {
- x10aux::exitCode = exitCode;
- } catch(x10aux::__ref& e) {
- fprintf(stderr, "%d: ", (int)__here__);
- //fprintf(stderr, "Caught %p\n", ((const x10aux::ref<Exception>&)e)._val);
- ((const x10aux::ref<Exception>&)e)->printStackTrace(System::x10__out);
- x10aux::exitCode = 1;
- } catch(...) {
- fprintf(stderr, "%d: Caught exception\n", (int)__here__);
- x10aux::exitCode = 1;
- }
- x10aux::free_args(args);
- return x10aux::exitCode;
- }
-}
-// the original app-main method
-
Deleted: trunk/x10.cppbackend.17/data/MainMP.xcd
===================================================================
--- trunk/x10.cppbackend.17/data/MainMP.xcd 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.cppbackend.17/data/MainMP.xcd 2009-08-13 15:29:43 UTC (rev 10974)
@@ -1,9 +0,0 @@
-// SYNOPSIS: #0.main(...)
-
-##include <x10/runtime/Runtime.h>
-##include <x10aux/bootstrap.h>
-extern "C" { int main(int ac, char **av) { return x10aux::template_main<x10::runtime::Runtime,#0 >(ac,av); } }
-
-
-// the original app-main method
-
Copied: trunk/x10.dist/.launchConfigs/x10cpp.launch (from rev 10973, trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch)
===================================================================
--- trunk/x10.dist/.launchConfigs/x10cpp.launch (rev 0)
+++ trunk/x10.dist/.launchConfigs/x10cpp.launch 2009-08-13 15:29:43 UTC (rev 10974)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="polyglot.ext.x10cpp.main.Main"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="x10.backend" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="lpg.runtime.java" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.compiler" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.constraints" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.common" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="polyglot3" type="1"/> "/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ext x10cpp ${resource_loc} -sourcepath ${project_loc:x10.runtime}/src-x10 -noserial -assert -d out -disable CheckNativeAnnotations -commandlineonly ${project_loc:x10.tests}/examples/x10lib/harness/x10Test.x10"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="x10.compiler"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="X10LIB" value="${project_loc:x10.compiler}/../pgas/common/work"/>
+<mapEntry key="X10LANG" value="${project_loc:x10.runtime}/src-cpp"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${container_loc}"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+</launchConfiguration>
Modified: trunk/x10.dist/bin/x10c++
===================================================================
--- trunk/x10.dist/bin/x10c++ 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.dist/bin/x10c++ 2009-08-13 15:29:43 UTC (rev 10974)
@@ -30,7 +30,7 @@
fi
-export CP_OVERRIDE="${TOP}${FILE_SEP}lib${FILE_SEP}x10cpp.jar${PATH_SEP}${TOP}${FILE_SEP}classes${PATH_SEP}"
+export CP_OVERRIDE="${TOP}${FILE_SEP}lib${FILE_SEP}x10c.jar${PATH_SEP}${TOP}${FILE_SEP}classes${PATH_SEP}"
export DEXT="x10cpp"
export MAIN="polyglot.ext.x10cpp.main.Main"
Modified: trunk/x10.dist/build.xml
===================================================================
--- trunk/x10.dist/build.xml 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.dist/build.xml 2009-08-13 15:29:43 UTC (rev 10974)
@@ -23,9 +23,7 @@
<property name="x10.common.location" location="${x10.home}/x10.common"/>
<property name="common.jar" value="x10common.jar"/>
<property name="x10.compiler.location" location="${x10.home}/x10.compiler"/>
- <property name="x10.cppbackend.location" location="${x10.home}/x10.cppbackend.17"/>
<property name="compiler.jar" value="x10c.jar"/>
- <property name="cppbackend.jar" value="x10cpp.jar"/>
<property name="config" value="standard.cfg"/>
<property name="x10.runtime.location" location="${x10.home}/x10.runtime"/>
<property name="runtime.jar" value="x10.jar"/>
@@ -72,11 +70,10 @@
<ant antfile="${x10.common.location}/build.xml" target="clean" inheritAll="false" dir="${x10.common.location}"/>
<ant antfile="${x10.runtime.location}/build.xml" target="clean" inheritAll="false" dir="${x10.runtime.location}"/>
<ant antfile="${x10.compiler.location}/build.xml" target="clean" inheritAll="false" dir="${x10.compiler.location}"/>
- <ant antfile="${x10.cppbackend.location}/build.xml" target="clean" inheritAll="false" dir="${x10.cppbackend.location}"/>
</target>
<target name="dist-java" depends="init,build,common-jar,constraints-jar,compiler-jar,runtime-java"/>
- <target name="dist-cpp" depends="dist-java,cppbackend-jar,runtime-cpp"/>
+ <target name="dist-cpp" depends="dist-java,runtime-cpp"/>
<target name="dist" depends="dist-java,dist-cpp"/>
<target name="lpg-jar" depends="init,lpg-local-jar" unless="local.lpg.jar">
@@ -171,14 +168,6 @@
</copy>
</target>
- <target name="cppbackend-jar" depends="init,compiler-jar">
- <ant antfile="${x10.cppbackend.location}/build.xml" target="jar" inheritAll="false" dir="${x10.cppbackend.location}"/>
- <mkdir dir="${lib}"/>
- <copy todir="${lib}">
- <fileset dir="${x10.cppbackend.location}/${builddir}" includes="${cppbackend.jar}"/>
- </copy>
- </target>
-
<target name="bin"
description="configure bin directory"
depends="bin-deps"
@@ -428,7 +417,6 @@
<zipfileset prefix="" dir="${x10.tests.location}" includes="TESTING"/>
<zipfileset prefix="x10.dist" dir="${basedir}" excludes="releng/**,**/.*.swp,lib/**,etc/**" includes=".launchConfigs/*,.classpath,.project,README,INSTALL,build*,exportPlugin.xml,bin/*.in,bin/x10c++,lib/${polyglot.jar},lib/${lpg.jar},lib/${ecj.jar},samples/**"/>
<zipfileset prefix="x10.compiler" dir="${x10.compiler.location}" excludes="releng/**,**/.*.swp,classes/**"/>
- <zipfileset prefix="x10.cppbackend.17" dir="${x10.cppbackend.location}" excludes="releng/**,**/.*.swp,classes/**"/>
<zipfileset prefix="x10.runtime" dir="${x10.runtime.location}" excludes="releng/**,**/.*.swp,classes/**,src-cpp/gen/**"/>
<zipfileset prefix="x10.constraints" dir="${x10.constraints.location}" excludes="releng/**,**/.*.swp,classes/**"/>
<zipfileset prefix="x10.common" dir="${x10.common.location}" excludes="releng/**,**/.*.swp,classes/**"/>
Modified: trunk/x10.dist/releng/exportRelease.sh
===================================================================
--- trunk/x10.dist/releng/exportRelease.sh 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.dist/releng/exportRelease.sh 2009-08-13 15:29:43 UTC (rev 10974)
@@ -74,7 +74,6 @@
x10.common \
x10.compiler \
x10.constraints \
- x10.cppbackend.17 \
x10.dist \
x10.runtime \
x10.tests
Modified: trunk/x10.runtime/src-cpp/Makefile
===================================================================
--- trunk/x10.runtime/src-cpp/Makefile 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.runtime/src-cpp/Makefile 2009-08-13 15:29:43 UTC (rev 10974)
@@ -134,7 +134,7 @@
# this simply means there will be more symbols in the archive than there should
# be. This is harmless and equivalent to the old behaviour of this Makefile,
# i.e. a make clean is needed.
-gen/all-cpp-generated: $(XRXFILES) $(INSTDIR)/lib/x10cpp.jar
+gen/all-cpp-generated: $(XRXFILES) $(INSTDIR)/lib/x10c.jar
@echo "Regenerating XRX cc/h/inc files"
mkdir -p gen
@#prune .svn dirs (they probably don't contain *.x10 files so this is just an optimisation)
Modified: trunk/x10.tests/bin/buildScript++
===================================================================
--- trunk/x10.tests/bin/buildScript++ 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.tests/bin/buildScript++ 2009-08-13 15:29:43 UTC (rev 10974)
@@ -141,8 +141,7 @@
svnUpdate $X10_DIST $X10_SVNROOT
X10_TESTS=$X10_HOME/x10.tests
svnUpdate $X10_TESTS $X10_SVNROOT
-X10_CPP=$X10_HOME/x10.cppbackend.17
-svnUpdate $X10_CPP $X10_SVNROOT
+svnUpdate $X10_SVNROOT
buildX10Module $POLYGLOT_HOME polyglot
@@ -152,7 +151,6 @@
buildX10Module $X10_DIST x10j
buildX10Module $X10_COMPILER x10
buildX10Module $X10_TESTS x10
-buildX10Module $X10_CPP x10
X10LIB=$X10LIB
if [[ -z "$X10LIB" ]]; then
Modified: trunk/x10.tests/bin/buildScriptCT++
===================================================================
--- trunk/x10.tests/bin/buildScriptCT++ 2009-08-13 14:47:14 UTC (rev 10973)
+++ trunk/x10.tests/bin/buildScriptCT++ 2009-08-13 15:29:43 UTC (rev 10974)
@@ -200,16 +200,6 @@
return $status
fi
- X10_CPP=$X10_HOME/x10.cppbackend.17
- if [[ -d $X10_CPP ]]; then
- rm -rf $X10_CPP
- fi
- svnUpdate $X10_CPP $X10_SVNROOT
- status=$?
- if (( $status != 0 )); then
- return $status
- fi
-
# build modules in the listed order -- some builds may be redundant
buildX10Module $POLYGLOT_HOME polyglot
status=$?
@@ -245,12 +235,6 @@
return $status
fi
- buildX10Module $X10_CPP x10
- status=$?
- if (( $status != 0 )); then
- return $status
- fi
-
if [[ -n "$X10GC" ]]; then
export INCLUDE_DIRS=-I${X10GC}/include
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
