Fix new JOCL artifacts location ; Fix new jocl.jar locationv2.0-rc11

2 files changed, 3 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index bf355e2..1b4d916 100644
--- a/build.xml
+++ b/build.xml
@@ -103,7 +103,7 @@
     </target>
 
     <target name="tag.build">
-        <copy file="${jocl.root}/dist/artifact.properties" todir="${build.dir}" overwrite="true"/>
+        <copy file="${jocl.root}/${rootrel.build}/artifact.properties" todir="${build.dir}" overwrite="true"/>
         <echo file="${build.dir}/artifact.properties" message="jocl-demos.build.number=${jocl-demos.build.number}${line.separator}" append="true" />
         <echo file="${build.dir}/artifact.properties" message="jocl-demos.build.id=${jocl-demos.build.id}${line.separator}" append="true" />
         <echo file="${build.dir}/artifact.properties" message="jocl-demos.build.branch=${jocl-demos.build.branch}${line.separator}" append="true" />
diff --git a/nbproject/project.properties b/nbproject/project.properties
index efda83e..e57700b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,7 +30,7 @@ debug.test.classpath=\
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
 dist.dir=${build.dir}
-dist.jar=${dist.dir}/jar/jocl-demos.jar
+dist.jar=${build.dir}/jar/jocl-demos.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
@@ -66,7 +66,7 @@ no.dependencies=true
 platform.active=default_platform
 
 project.jocl=${jocl.root}
-reference.jocl.jar=${jocl.root}/dist/jocl.jar
+reference.jocl.jar=${jocl.root}/${rootrel.build}/jar/jocl.jar
 file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.jar
 file.reference.jogl-all.jar=${jogl.root}/${rootrel.build}/jar/jogl-all.jar