incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbuff...@apache.org
Subject svn commit: r498222 - in /incubator/xap/trunk/buildsystem: build.bat buildscripts/build.xml buildscripts/buildUtil.js
Date Sun, 21 Jan 2007 00:59:14 GMT
Author: bbuffone
Date: Sat Jan 20 16:59:13 2007
New Revision: 498222

URL: http://svn.apache.org/viewvc?view=rev&rev=498222
Log:
changed build scripts to work with new directory structure.

Modified:
    incubator/xap/trunk/buildsystem/build.bat
    incubator/xap/trunk/buildsystem/buildscripts/build.xml
    incubator/xap/trunk/buildsystem/buildscripts/buildUtil.js

Modified: incubator/xap/trunk/buildsystem/build.bat
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildsystem/build.bat?view=diff&rev=498222&r1=498221&r2=498222
==============================================================================
--- incubator/xap/trunk/buildsystem/build.bat (original)
+++ incubator/xap/trunk/buildsystem/build.bat Sat Jan 20 16:59:13 2007
@@ -7,7 +7,7 @@
 rem Uncomment the line below and set the JAVA_HOME to point to a JDK 1.5 install
 rem set JAVA_HOME=
 
-set CLASSPATH=%CLASSPATH%;./jsunit/java/lib/junit.jar
+set CLASSPATH=%CLASSPATH%;./unittests/jsunit/java/lib/junit.jar
 set PATH=%PATH%;%ANT_HOME%
 
 call ant %*

Modified: incubator/xap/trunk/buildsystem/buildscripts/build.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildsystem/buildscripts/build.xml?view=diff&rev=498222&r1=498221&r2=498222
==============================================================================
--- incubator/xap/trunk/buildsystem/buildscripts/build.xml (original)
+++ incubator/xap/trunk/buildsystem/buildscripts/build.xml Sat Jan 20 16:59:13 2007
@@ -22,14 +22,14 @@
 
 	<!-- project properties -->
 	<property name="project" value="dojo"/>
-	<property name="build_dir" value="../build"/>
-	<property name="root" value=".."/>
+	<property name="build_dir" value="../../build"/>
+	<property name="root" value="../../"/>
 	<property name="src" value="src"/>
 	<property name="version" value="0.0.0.dev"/>
 	<property name="lang" value="en"/>
 	<property name="releaseName" value="${project}"/>
 	<property name="dojoLoader" value="default"/>
-	<property name="release_dir" value="${root}/release/${releaseName}"/>
+	<property name="release_dir" value="${root}/.dist/.temp/release/${releaseName}"/>
 	<property name="docs_dir" value="${root}/documents"/>
 	<property name="articles_dir" value="${docs_dir}/articles"/>
 	<property name="release_docs_dir" value="${release_dir}/documents"/>
@@ -484,7 +484,6 @@
 	<!-- compress task -->
 	<target name="compress" depends="-fix-config, list-profile-deps"
 		description="runs compression code over release JS files">
-		<echo>profileFile: ${profileFile}</echo>
 		
 		<!-- Create the release dir if it doesn't exist. -->
 		<mkdir dir="${release_dir}"/>
@@ -495,7 +494,10 @@
 ${profileDeps}
 
 		</echo>
-
+		
+		<available property="test" file="${profileFile}" />
+		<echo>profileFile: ${profileFile} is avialable: ${test}</echo>
+				
 		<!-- now write 'em all to a single file -->
 		<concat fixlastline="yes" eol="crlf" destfile="${release_dir}/source.__package__.js">
 		<!--

Modified: incubator/xap/trunk/buildsystem/buildscripts/buildUtil.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildsystem/buildscripts/buildUtil.js?view=diff&rev=498222&r1=498221&r2=498222
==============================================================================
--- incubator/xap/trunk/buildsystem/buildscripts/buildUtil.js (original)
+++ incubator/xap/trunk/buildsystem/buildscripts/buildUtil.js Sat Jan 20 16:59:13 2007
@@ -2,10 +2,10 @@
 buildUtil.getDependencyList = function(dependencies, hostenvType) {
 
 	djConfig = {
-		baseRelativePath: "../"
+		baseRelativePath: "../../codebase/"
 		// ,isDebug: true
 	};
-	
+		
 	if(!dependencies){
 		dependencies = [ 
 			"dojo.event.*",
@@ -25,27 +25,27 @@
 	var dj_global = {};
 	
 	
-	load("../src/dojo/src/bootstrap1.js");
-	load("../src/dojo/src/loader.js");
-	load("../src/dojo/src/hostenv_rhino.js");
-	load("../src/dojo/src/bootstrap2.js");
+	load(djConfig.baseRelativePath + "src/dojo/src/bootstrap1.js");
+	load(djConfig.baseRelativePath + "src/dojo/src/loader.js");
+	load(djConfig.baseRelativePath + "src/dojo/src/hostenv_rhino.js");
+	load(djConfig.baseRelativePath + "src/dojo/src/bootstrap2.js");
   
   	//Needed to kick off the Xap Code inclusion.
-  	load("../src/xap/Xap.js");
+  	load(djConfig.baseRelativePath + "src/xap/Xap.js");
   
 	// FIXME: is this really what we want to say?
 	dojo.render.html.capable = true;
 
 	
 	dojo.hostenv.loadedUris.push("dojoGuardStart.js");
-	dojo.hostenv.loadedUris.push("../src/dojo/src/bootstrap1.js");
+	dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/bootstrap1.js");
 	
 	if(dojoLoader == "default"){
-		dojo.hostenv.loadedUris.push("../src/dojo/src/loader.js");
+		dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/loader.js");
 	
 	}else if(dojoLoader=="xdomain"){
-		dojo.hostenv.loadedUris.push("../src/dojo/src/loader.js");
-		dojo.hostenv.loadedUris.push("../src/dojo/src/loader_xd.js");
+		dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/loader.js");
+		dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/loader_xd.js");
 	}
 	dojo.hostenv.loadedUris.push("dojoGuardEnd.js");
 	
@@ -55,17 +55,17 @@
 	
 	if(hostenvType.constructor == Array){
 		for(var x=0; x<hostenvType.length; x++){
-			dojo.hostenv.loadedUris.push("../src/dojo/src/hostenv_"+hostenvType[x]+".js");
+			dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/hostenv_"+hostenvType[x]+".js");
 		}
 		hostenvType = hostenvType.pop();
 	}else{
-		dojo.hostenv.loadedUris.push("../src/dojo/src/hostenv_"+hostenvType+".js");
+		dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/hostenv_"+hostenvType+".js");
 	}
 	
-	dojo.hostenv.loadedUris.push("../src/dojo/src/bootstrap2.js");
+	dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/dojo/src/bootstrap2.js");
   
-  dojo.hostenv.loadedUris.push("../src/xap/util/Utils.js");
-  dojo.hostenv.loadedUris.push("../src/xap/Xap.js");
+  dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/xap/util/Utils.js");
+  dojo.hostenv.loadedUris.push(djConfig.baseRelativePath + "src/xap/Xap.js");
 	
 	if(dependencies["prefixes"]){
 		var tmp = dependencies.prefixes;



Mime
View raw message