Menu
▾
▴
[X10-commits] SF.net SVN: x10:[10972] trunk
|
From: <dgr...@us...> - 2009-08-13 14:18:58
|
Revision: 10972
http://x10.svn.sourceforge.net/x10/?rev=10972&view=rev
Author: dgrove-oss
Date: 2009-08-13 14:18:48 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Remove the .17 suffix from x10.runtime and x10.common
Modified Paths:
--------------
trunk/SafeX10/.classpath
trunk/x10.common/.project
trunk/x10.common/META-INF/MANIFEST.MF
trunk/x10.common/build.xml
trunk/x10.common/exportPlugin.xml
trunk/x10.compiler.p3/META-INF/MANIFEST.MF
trunk/x10.compiler.p3/build.xml
trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch
trunk/x10.cppbackend.17/META-INF/MANIFEST.MF
trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/X10CPPTranslator.java
trunk/x10.dist/.launchConfigs/x10.launch
trunk/x10.dist/.launchConfigs/x10c.launch
trunk/x10.dist/bin/x10c++
trunk/x10.dist/build.xml
trunk/x10.dist/releng/exportRelease.sh
trunk/x10.runtime/.project
trunk/x10.runtime/META-INF/MANIFEST.MF
trunk/x10.runtime/build.xml
trunk/x10.runtime/exportPlugin.xml
trunk/x10.tests/bin/buildScript
trunk/x10.tests/bin/buildScript++
trunk/x10.tests/bin/buildScriptCT
trunk/x10.tests/bin/buildScriptCT++
trunk/x10.tests/bin/driverScript
trunk/x10.tests/bin/driverScript++
trunk/x10.tests/bin/driverScriptCT
trunk/x10.tests/bin/driverScriptCT++
trunk/x10.tests/bin/preCompileScript
trunk/x10.tests/bin/preCompileScriptCT
trunk/x10.tests/bin/xtestScript++
trunk/x10.tests/bin/xtestScriptCT++
Added Paths:
-----------
trunk/x10.common/
trunk/x10.runtime/
Removed Paths:
-------------
trunk/x10.common.17/
trunk/x10.runtime.17/
Modified: trunk/SafeX10/.classpath
===================================================================
--- trunk/SafeX10/.classpath 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/SafeX10/.classpath 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="C:/eclipse332ForX1017/eclipse/plugins/x10.runtime.17_1.7.3.1.jar"/>
+ <classpathentry kind="lib" path="C:/eclipse332ForX1017/eclipse/plugins/x10.runtime_1.7.3.1.jar"/>
<classpathentry kind="lib" path="C:/eclipse332ForX1017/eclipse/plugins/x10.constraints_1.7.3.1.jar"/>
- <classpathentry kind="lib" path="C:/eclipse332ForX1017/eclipse/plugins/x10.common.17_1.7.3.1.jar"/>
+ <classpathentry kind="lib" path="C:/eclipse332ForX1017/eclipse/plugins/x10.common_1.7.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java50"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/x10.common/.project
===================================================================
--- trunk/x10.common.17/.project 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.common/.project 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>x10.common.17</name>
+ <name>x10.common</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/x10.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/x10.common.17/META-INF/MANIFEST.MF 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.common/META-INF/MANIFEST.MF 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common
-Bundle-SymbolicName: x10.common.17
+Bundle-SymbolicName: x10.common
Bundle-Version: 1.7.4.0
Export-Package: x10.config
Modified: trunk/x10.common/build.xml
===================================================================
--- trunk/x10.common.17/build.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.common/build.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [<!ENTITY buildfile SYSTEM "file:./build-user.xml">]>
-<project name="x10.common.17" default="build" basedir=".">
+<project name="x10.common" default="build" basedir=".">
&buildfile;
<property name="x10.home" value="${basedir}/.."/>
<property name="x10.dist.location" value="${x10.home}/x10.dist"/>
Modified: trunk/x10.common/exportPlugin.xml
===================================================================
--- trunk/x10.common.17/exportPlugin.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.common/exportPlugin.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="x10.common.17" default="build.update.jar" basedir=".">
+<project name="x10.common" default="build.update.jar" basedir=".">
<import file="../org.eclipse.imp.x10dt.feature/buildCommon.xml"/>
<import file="../org.eclipse.imp.x10dt.update/buildPluginCommon.xml"/>
Modified: trunk/x10.compiler.p3/META-INF/MANIFEST.MF
===================================================================
--- trunk/x10.compiler.p3/META-INF/MANIFEST.MF 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.compiler.p3/META-INF/MANIFEST.MF 2009-08-13 14:18:48 UTC (rev 10972)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: x10.compiler.p3
Bundle-Version: 1.7.4.0
Bundle-Localization: plugin
-Require-Bundle: x10.common.17,
+Require-Bundle: x10.common,
x10.constraints,
lpg.runtime,
polyglot3
Modified: trunk/x10.compiler.p3/build.xml
===================================================================
--- trunk/x10.compiler.p3/build.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.compiler.p3/build.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -9,7 +9,7 @@
<!--<property name="lpg.executable.location" location="${x10.home}/lpg.generator.${platform}_${os.arch}/lpgexe"/>-->
<property name="x10.runtime.location" value="${x10.home}/x10.runtime.x10"/>
<property name="x10.constraints.location" location="${x10.home}/x10.constraints"/>
- <property name="x10.common.location" location="${x10.home}/x10.common.17"/>
+ <property name="x10.common.location" location="${x10.home}/x10.common"/>
<property name="build" location="${basedir}/classes"/>
<property name="src" location="${basedir}/src"/>
<property name="lib" location="${x10.dist.location}/lib"/>
Modified: trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch
===================================================================
--- trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.cppbackend.17/.launchConfigs/x10cpp.launch 2009-08-13 14:18:48 UTC (rev 10972)
@@ -8,10 +8,10 @@
<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.p3" 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.17" 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.17}/src-x10 -noserial -assert -d out -disable CheckNativeAnnotations -commandlineonly ${project_loc:x10.tests}/examples/x10lib/harness/x10Test.x10"/>
+<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">
@@ -20,7 +20,7 @@
</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.17}/src-cpp"/>
+<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"/>
Modified: trunk/x10.cppbackend.17/META-INF/MANIFEST.MF
===================================================================
--- trunk/x10.cppbackend.17/META-INF/MANIFEST.MF 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.cppbackend.17/META-INF/MANIFEST.MF 2009-08-13 14:18:48 UTC (rev 10972)
@@ -16,7 +16,7 @@
polyglot.ext.x10cuda.visit,
x10c.util
Require-Bundle: polyglot3,
- x10.common.17,
+ x10.common,
x10.compiler.p3,
x10.constraints
Bundle-ActivationPolicy: lazy
Modified: trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/X10CPPTranslator.java
===================================================================
--- trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/X10CPPTranslator.java 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/X10CPPTranslator.java 2009-08-13 14:18:48 UTC (rev 10972)
@@ -455,7 +455,7 @@
return (DelegateTargetFactory) this.tf;
}
- public static final String X10LANG = System.getenv("X10LANG")==null?"../../../x10.runtime.17/src-cpp":System.getenv("X10LANG").replace(File.separatorChar, '/');
+ public static final String X10LANG = System.getenv("X10LANG")==null?"../../../x10.runtime/src-cpp":System.getenv("X10LANG").replace(File.separatorChar, '/');
public static final String MANIFEST = "libx10.mft";
public static final String[] MANIFEST_LOCATIONS = new String[] {
X10LANG,
Modified: trunk/x10.dist/.launchConfigs/x10.launch
===================================================================
--- trunk/x10.dist/.launchConfigs/x10.launch 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.dist/.launchConfigs/x10.launch 2009-08-13 14:18:48 UTC (rev 10972)
@@ -8,7 +8,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;x10.runtime.17&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;x10.constraints&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;folder nest=&quot;true&quot; path=&quot;/x10.common/examples/Constructs/AtEach&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;folder nest=&quot;true&quot; path=&quot;/x10.runtime/src&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;x10.runtime&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;javaProject name=&quot;x10.constraints&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;folder nest=&quot;true&quot; path=&quot;/x10.common/examples/Constructs/AtEach&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;folder nest=&quot;true&quot; path=&quot;/x10.runtime/src&quot;/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -16,13 +16,13 @@
<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" path="1" type="4"/> "/>
<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.runtime.17" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.runtime" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="polyglot3" type="1"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="x10.runtime.impl.java.Runtime"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${resource_name}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="x10.runtime.17"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="x10.runtime"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${container_loc}"/>
</launchConfiguration>
Modified: trunk/x10.dist/.launchConfigs/x10c.launch
===================================================================
--- trunk/x10.dist/.launchConfigs/x10c.launch 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.dist/.launchConfigs/x10c.launch 2009-08-13 14:18:48 UTC (rev 10972)
@@ -14,7 +14,7 @@
<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.compiler.p3" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.pde.core.requiredPlugins" javaProject="polyglot3" path="3" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.runtime.17" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.runtime" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="x10.compiler.p3" 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="lpg.runtime.java" type="1"/> "/>
@@ -23,7 +23,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="polyglot.main.Main"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ext x10 "${resource_loc}" -sourcepath "${workspace_loc:x10.runtime.17/src-x10}" -sourcepath "${workspace_loc:x10.dist}/lib/x10.jar" -sourcepath "${workspace_loc:x10.tests}/examples/x10lib" -noserial -assert -post "javac -source 1.5" -d out -disable CheckNativeAnnotations"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-ext x10 "${resource_loc}" -sourcepath "${workspace_loc:x10.runtime/src-x10}" -sourcepath "${workspace_loc:x10.dist}/lib/x10.jar" -sourcepath "${workspace_loc:x10.tests}/examples/x10lib" -noserial -assert -post "javac -source 1.5" -d out -disable CheckNativeAnnotations"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="x10.compiler.p3"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${container_loc}"/>
Modified: trunk/x10.dist/bin/x10c++
===================================================================
--- trunk/x10.dist/bin/x10c++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.dist/bin/x10c++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -24,8 +24,8 @@
# Default to developer setup
[ -z "$X10REL" ] && export X10REL="../x10.dist"
[ -z "$X10LIB" ] && export X10LIB="$TOP/../pgas2/common/work"
- [ -z "$X10LANG" ] && export X10LANG="$TOP/../x10.runtime.17/src-cpp"
- [ -z "$X10GC" ] && export X10GC="$TOP/../x10.runtime.17/src-cpp/bdwgc/install"
+ [ -z "$X10LANG" ] && export X10LANG="$TOP/../x10.runtime/src-cpp"
+ [ -z "$X10GC" ] && export X10GC="$TOP/../x10.runtime/src-cpp/bdwgc/install"
X10="$(cd "$TOP/$X10REL" && pwd)"
fi
Modified: trunk/x10.dist/build.xml
===================================================================
--- trunk/x10.dist/build.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.dist/build.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -20,14 +20,14 @@
<property name="polyglot.jar.url" value="${polyglot.url}/polyglot3_3.1.0.jar"/>
<property name="x10.constraints.location" location="${x10.home}/x10.constraints"/>
<property name="constraints.jar" value="x10constraints.jar"/>
- <property name="x10.common.location" location="${x10.home}/x10.common.17"/>
+ <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.p3"/>
<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.17"/>
+ <property name="x10.runtime.location" location="${x10.home}/x10.runtime"/>
<property name="runtime.jar" value="x10.jar"/>
<property name="x10.tests.location" location="${x10.home}/x10.tests"/>
<path id="project.classpath"/>
@@ -429,9 +429,9 @@
<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.p3" 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.17" dir="${x10.runtime.location}" excludes="releng/**,**/.*.swp,classes/**,src-cpp/gen/**"/>
+ <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.17" dir="${x10.common.location}" excludes="releng/**,**/.*.swp,classes/**"/>
+ <zipfileset prefix="x10.common" dir="${x10.common.location}" excludes="releng/**,**/.*.swp,classes/**"/>
<zipfileset prefix="x10.tests" dir="${x10.tests.location}" excludes="releng/**,**/.*.swp,lib/**,etc/**" includes="build*,README,bin/*.in,bin/testScript*,bin/newpgrp,bin/listFailures,examples/README,**/*.x10,**/.ThisIsAnX10TestDirectory"/>
</zip>
</target>
Modified: trunk/x10.dist/releng/exportRelease.sh
===================================================================
--- trunk/x10.dist/releng/exportRelease.sh 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.dist/releng/exportRelease.sh 2009-08-13 14:18:48 UTC (rev 10972)
@@ -71,12 +71,12 @@
echo
echo getting distrib
for i in \
- x10.common.17 \
+ x10.common \
x10.compiler.p3 \
x10.constraints \
x10.cppbackend.17 \
x10.dist \
- x10.runtime.17 \
+ x10.runtime \
x10.tests
do
svn $svn_command https://x10.svn.sourceforge.net/svnroot/x10/tags/$X10_TAG/$i
Modified: trunk/x10.runtime/.project
===================================================================
--- trunk/x10.runtime.17/.project 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.runtime/.project 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>x10.runtime.17</name>
+ <name>x10.runtime</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/x10.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/x10.runtime.17/META-INF/MANIFEST.MF 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.runtime/META-INF/MANIFEST.MF 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: X10 runtime
-Bundle-SymbolicName: x10.runtime.17
+Bundle-SymbolicName: x10.runtime
Bundle-Version: 1.7.4.0
Eclipse-AutoStart: true
Bundle-Vendor: rf...@wa...
-Require-Bundle: x10.common.17,
+Require-Bundle: x10.common,
x10.constraints
Modified: trunk/x10.runtime/build.xml
===================================================================
--- trunk/x10.runtime.17/build.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.runtime/build.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -5,7 +5,7 @@
<property name="x10.home" value="${basedir}/.."/>
<property name="x10.dist.location" value="${x10.home}/x10.dist"/>
<property name="x10.constraints.location" location="${x10.home}/x10.constraints"/>
- <property name="x10.common.location" location="${x10.home}/x10.common.17"/>
+ <property name="x10.common.location" location="${x10.home}/x10.common"/>
<property name="build" location="${basedir}/classes"/>
<property name="src" location="${basedir}/src-java"/>
<property name="inc" location="${x10.dist.location}/include"/>
Modified: trunk/x10.runtime/exportPlugin.xml
===================================================================
--- trunk/x10.runtime.17/exportPlugin.xml 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.runtime/exportPlugin.xml 2009-08-13 14:18:48 UTC (rev 10972)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="x10.runtime.17" default="build.update.jar" basedir=".">
+<project name="x10.runtime" default="build.update.jar" basedir=".">
<import file="../org.eclipse.imp.x10dt.feature/buildCommon.xml"/>
<import file="../org.eclipse.imp.x10dt.update/buildPluginCommon.xml"/>
Modified: trunk/x10.tests/bin/buildScript
===================================================================
--- trunk/x10.tests/bin/buildScript 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/buildScript 2009-08-13 14:18:48 UTC (rev 10972)
@@ -125,11 +125,11 @@
POLYGLOT_HOME=$X10_HOME/polyglot
svnUpdate $POLYGLOT_HOME $POLYGLOT_SVNROOT
-X10_COMMON=$X10_HOME/x10.common.17
+X10_COMMON=$X10_HOME/x10.common
svnUpdate $X10_COMMON $X10_SVNROOT
X10_COMPILER=$X10_HOME/x10.compiler.p3
svnUpdate $X10_COMPILER $X10_SVNROOT
-X10_RUNTIME=$X10_HOME/x10.runtime.17
+X10_RUNTIME=$X10_HOME/x10.runtime
svnUpdate $X10_RUNTIME $X10_SVNROOT
X10_CONSTRAINTS=$X10_HOME/x10.constraints
svnUpdate $X10_CONSTRAINTS $X10_SVNROOT
Modified: trunk/x10.tests/bin/buildScript++
===================================================================
--- trunk/x10.tests/bin/buildScript++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/buildScript++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -129,11 +129,11 @@
POLYGLOT_HOME=$X10_HOME/polyglot
svnUpdate $POLYGLOT_HOME $POLYGLOT_SVNROOT
-X10_COMMON=$X10_HOME/x10.common.17
+X10_COMMON=$X10_HOME/x10.common
svnUpdate $X10_COMMON $X10_SVNROOT
X10_COMPILER=$X10_HOME/x10.compiler.p3
svnUpdate $X10_COMPILER $X10_SVNROOT
-X10_RUNTIME=$X10_HOME/x10.runtime.17
+X10_RUNTIME=$X10_HOME/x10.runtime
svnUpdate $X10_RUNTIME $X10_SVNROOT
X10_CONSTRAINTS=$X10_HOME/x10.constraints
svnUpdate $X10_CONSTRAINTS $X10_SVNROOT
Modified: trunk/x10.tests/bin/buildScriptCT
===================================================================
--- trunk/x10.tests/bin/buildScriptCT 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/buildScriptCT 2009-08-13 14:18:48 UTC (rev 10972)
@@ -124,7 +124,7 @@
return $status
fi
- X10_COMMON=$X10_HOME/x10.common.17
+ X10_COMMON=$X10_HOME/x10.common
if [[ -d $X10_COMMON ]]; then
rm -rf $X10_COMMON
fi
@@ -144,7 +144,7 @@
return $status
fi
- X10_RUNTIME=$X10_HOME/x10.runtime.17
+ X10_RUNTIME=$X10_HOME/x10.runtime
if [[ -d $X10_RUNTIME ]]; then
rm -rf $X10_RUNTIME
fi
Modified: trunk/x10.tests/bin/buildScriptCT++
===================================================================
--- trunk/x10.tests/bin/buildScriptCT++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/buildScriptCT++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -133,7 +133,7 @@
return $status
fi
- X10_COMMON=$X10_HOME/x10.common.17
+ X10_COMMON=$X10_HOME/x10.common
if [[ -d $X10_COMMON ]]; then
rm -rf $X10_COMMON
fi
@@ -153,7 +153,7 @@
return $status
fi
- X10_RUNTIME=$X10_HOME/x10.runtime.17
+ X10_RUNTIME=$X10_HOME/x10.runtime
if [[ -d $X10_RUNTIME ]]; then
rm -rf $X10_RUNTIME
fi
@@ -288,7 +288,7 @@
fi
if [[ -n "$ENABLE_GC" && -z "$X10GC" ]]; then
- export X10GC=${X10_HOME}/x10.runtime.17/src-cpp/bdwgc/install
+ export X10GC=${X10_HOME}/x10.runtime/src-cpp/bdwgc/install
fi
main
Modified: trunk/x10.tests/bin/driverScript
===================================================================
--- trunk/x10.tests/bin/driverScript 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/driverScript 2009-08-13 14:18:48 UTC (rev 10972)
@@ -42,7 +42,7 @@
printf "\n##### Begin regression tests: `date` #####\n\n"
cd $X10_HOME/x10.tests/examples
-export EXTRA_CLASSPATH=$X10_HOME/x10.runtime.17/src-x10/classes
+export EXTRA_CLASSPATH=$X10_HOME/x10.runtime/src-x10/classes
export X10DIST=$X10_HOME/x10.dist
#$X10_HOME/x10.tests/bin/xtestScript -clean -shiftLog -m 'vsa...@us... ny...@us... ig...@us... bd...@us... gr...@us... ta...@us... tib...@us... srk...@li...'
$X10_HOME/x10.tests/bin/xtestScript -clean -shiftLog -m 'x10...@li...'
Modified: trunk/x10.tests/bin/driverScript++
===================================================================
--- trunk/x10.tests/bin/driverScript++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/driverScript++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -35,7 +35,7 @@
#$ABSDIR/xtestScript++ -logPath $LOGD -list 'Misc/*.x10';
#$ABSDIR/xtestScript++ -logPath $LOGD -list 'Benchmarks/*.x10';
#$ABSDIR/xtestScript++ -logPath $LOGD;
-export X10LANG=$X10_HOME/x10.runtime.17/src-cpp
+export X10LANG=$X10_HOME/x10.runtime/src-cpp
( \
cd $X10_HOME/x10.tests/examples; \
$ABSDIR/xtestScript++ -logPath $LOGD -mailAddr srk...@li... -mailList 'ig...@us... vsa...@us... gr...@us...'; \
Modified: trunk/x10.tests/bin/driverScriptCT
===================================================================
--- trunk/x10.tests/bin/driverScriptCT 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/driverScriptCT 2009-08-13 14:18:48 UTC (rev 10972)
@@ -246,8 +246,8 @@
##### cat feed - test (cases) compilation & execution
__cat_feed_stage=TEST
-#export EXTRA_CLASSPATH=$X10_HOME/x10.runtime.17/src-x10/classes
-export EXTRA_CLASSPATH=$X10_HOME/x10.runtime.17/classes/gen
+#export EXTRA_CLASSPATH=$X10_HOME/x10.runtime/src-x10/classes
+export EXTRA_CLASSPATH=$X10_HOME/x10.runtime/classes/gen
if [[ "${__cat_backend}" == x10c ]]; then
__cat_extra_classpath=$EXTRA_CLASSPATH
else
Modified: trunk/x10.tests/bin/driverScriptCT++
===================================================================
--- trunk/x10.tests/bin/driverScriptCT++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/driverScriptCT++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -143,12 +143,12 @@
X10LANG=$X10LANG
if [[ -z "$X10LANG" ]]; then
- export X10LANG=${X10_HOME}/x10.runtime.17/src-cpp
+ export X10LANG=${X10_HOME}/x10.runtime/src-cpp
fi
X10GC=$X10GC
if [[ -n "$ENABLE_GC" && -z "$X10GC" ]]; then
- export X10GC=${X10_HOME}/x10.runtime.17/src-cpp/bdwgc/install
+ export X10GC=${X10_HOME}/x10.runtime/src-cpp/bdwgc/install
fi
LOGD=$LOGD
@@ -289,8 +289,8 @@
##### cat feed - test (cases) compilation & execution
__cat_feed_stage=TEST
-#export EXTRA_CLASSPATH=$X10_HOME/x10.runtime.17/src-x10/classes
-export EXTRA_CLASSPATH=$X10_HOME/x10.runtime.17/classes/gen
+#export EXTRA_CLASSPATH=$X10_HOME/x10.runtime/src-x10/classes
+export EXTRA_CLASSPATH=$X10_HOME/x10.runtime/classes/gen
if [[ "${__cat_backend}" == x10c ]]; then
__cat_extra_classpath=$EXTRA_CLASSPATH
else
Modified: trunk/x10.tests/bin/preCompileScript
===================================================================
--- trunk/x10.tests/bin/preCompileScript 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/preCompileScript 2009-08-13 14:18:48 UTC (rev 10972)
@@ -14,7 +14,7 @@
X10_HOME=$(cd $MYDIR/../..; pwd)
fi
-X10_RUNTIME=$X10_HOME/x10.runtime.17
+X10_RUNTIME=$X10_HOME/x10.runtime
if [[ ! -d $X10_RUNTIME ]]; then
printf "[$prog: err]: checkout $X10_RUNTIME and rerun this script!\n"
exit 1
Modified: trunk/x10.tests/bin/preCompileScriptCT
===================================================================
--- trunk/x10.tests/bin/preCompileScriptCT 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/preCompileScriptCT 2009-08-13 14:18:48 UTC (rev 10972)
@@ -14,9 +14,9 @@
export X10_HOME=$(cd $MYDIR/../..; pwd)
fi
-SRC_X10=$X10_HOME/x10.runtime.17/src-x10
+SRC_X10=$X10_HOME/x10.runtime/src-x10
if [[ ! -d $SRC_X10 ]]; then
- printf "[$prog: err]: checkout x10.runtime.17 and rerun this script!\n"
+ printf "[$prog: err]: checkout x10.runtime and rerun this script!\n"
exit 1
fi
Modified: trunk/x10.tests/bin/xtestScript++
===================================================================
--- trunk/x10.tests/bin/xtestScript++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/xtestScript++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -508,7 +508,7 @@
X10LANG=$X10LANG
if [[ -z "$X10LANG" ]]; then
- X10LANG=$X10_HOME/x10.runtime.17/src-cpp
+ X10LANG=$X10_HOME/x10.runtime/src-cpp
fi
if [[ ! (-f $X10LANG/x10rt17.h || -f $X10LANG/include/x10rt17.h) ]]; then
printf "\n[$prog: err]: unable to locate x10rt header files!\n"
Modified: trunk/x10.tests/bin/xtestScriptCT++
===================================================================
--- trunk/x10.tests/bin/xtestScriptCT++ 2009-08-13 10:50:24 UTC (rev 10971)
+++ trunk/x10.tests/bin/xtestScriptCT++ 2009-08-13 14:18:48 UTC (rev 10972)
@@ -601,7 +601,7 @@
X10LANG=$X10LANG
if [[ -z "$X10LANG" ]]; then
- X10LANG=$X10_HOME/x10.runtime.17/src-cpp
+ X10LANG=$X10_HOME/x10.runtime/src-cpp
fi
if [[ ! (-f $X10LANG/x10rt17.h || -f $X10LANG/include/x10rt17.h) ]]; then
printf "\n[$prog: err]: unable to locate x10rt header files!\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
