You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by mt...@apache.org on 2006/08/23 18:47:43 UTC
svn commit: r434123 - in /incubator/xap/trunk: build.bat build.xml
buildscripts/build.xml buildscripts/profiles/xap.profile.js
Author: mturyn
Date: Wed Aug 23 11:47:42 2006
New Revision: 434123
URL: http://svn.apache.org/viewvc?rev=434123&view=rev
Log:
New build scripts for compressed/glommed files. (see http://issues.apache.org/jira/browse/XAP-7 ).
Modified:
incubator/xap/trunk/build.bat
incubator/xap/trunk/build.xml
incubator/xap/trunk/buildscripts/build.xml
incubator/xap/trunk/buildscripts/profiles/xap.profile.js
Modified: incubator/xap/trunk/build.bat
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/build.bat?rev=434123&r1=434122&r2=434123&view=diff
==============================================================================
--- incubator/xap/trunk/build.bat (original)
+++ incubator/xap/trunk/build.bat Wed Aug 23 11:47:42 2006
@@ -8,6 +8,25 @@
rem set JAVA_HOME=
set CLASSPATH=%CLASSPATH%;./jsunit/java/lib/junit.jar
+
+if "%1"=="compress" (
+ pushd buildscripts
+ ant -Dprofile=%2 -Drelease_dir=%3 compress
+ popd
+ goto EOF
+)
+
+if "%1"=="examples" (
+ pushd buildscripts
+ rem if exist ..\build (rmdir /s/q ..\build)
+ rem mkdir ..\build
+ ant -Dprofile=xap -Drelease_dir=../build clean compress
+ popd
+ ant examples
+ goto EOF
+)
+
call ant.bat %*
if "%OS%"=="Windows_NT" @endlocal
+:EOF
Modified: incubator/xap/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/build.xml?rev=434123&r1=434122&r2=434123&view=diff
==============================================================================
--- incubator/xap/trunk/build.xml (original)
+++ incubator/xap/trunk/build.xml Wed Aug 23 11:47:42 2006
@@ -8,6 +8,7 @@
<property name="isDebug" value="true" />
<property name="jsunitDir" value="./jsunit" />
<property name="webappsRoot" value="./staging" />
+ <property name="dist" value="./dist" />
<property name="examplesAppName" value="xap" />
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -68,6 +69,11 @@
<copy todir="${webappsRoot}/${examplesAppName}" overwrite="true">
<fileset dir="./WebContent" includes="*/**" />
</copy>
+
+ <copy file="./dist/zimbra.js" todir="${webappsRoot}/${examplesAppName}"/>
+ <copy file="./build/xapcore.js" todir="${webappsRoot}/${examplesAppName}"/>
+
+
<copy todir="${webappsRoot}/${examplesAppName}" overwrite="true">
<fileset dir="." includes="src/**" />
</copy>
Modified: incubator/xap/trunk/buildscripts/build.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildscripts/build.xml?rev=434123&r1=434122&r2=434123&view=diff
==============================================================================
--- incubator/xap/trunk/buildscripts/build.xml (original)
+++ incubator/xap/trunk/buildscripts/build.xml Wed Aug 23 11:47:42 2006
@@ -538,21 +538,14 @@
<antcall target="-rhino-compress">
<param name="srcFile" value="${release_dir}/source.__package__.js" />
- <param name="dstFile" value="${release_dir}/dojo.js" />
+ <param name="dstFile" value="${release_dir}/xapcore.js" />
</antcall>
<antcall target="-no-rhino-compress">
<param name="srcFile" value="${release_dir}/source.__package__.js" />
- <param name="dstFile" value="${release_dir}/dojo.js" />
+ <param name="dstFile" value="${release_dir}/xapcore.js" />
</antcall>
- <!--
- <java jar="./lib/custom_rhino.jar" fork="true" output="${release_dir}/__package__.js">
- <arg value="-c" />
- <arg value="${release_dir}/source.__package__.js" />
- </java>
- -->
-
<!-- add build notice -->
<replaceregexp match="^" byline="false" replace="${build_notice}">
<fileset dir="${release_dir}" includes="dojo.js"/>
@@ -571,16 +564,6 @@
<delete file="${release_dir}/source.__package__.js"/>
- <!-- we copy over iframe_history.html here just in case this is a truly
- stand-alone build that isn't being kicked off via release -->
- <copy file="../iframe_history.html" todir="${release_dir}/" />
-
- <!-- copy our dojo.storage and dojo.flash SWFs -->
- <copy todir="${release_dir}/" preservelastmodified="true">
- <fileset dir="${root}/">
- <include name="**/*.swf" />
- </fileset>
- </copy>
</target>
<!-- end compress task -->
@@ -597,8 +580,7 @@
</java>
</target>
- <target name="-no-rhino-compress"
- if="nostrip">
+ <target name="-no-rhino-compress" if="nostrip">
<copy overwrite="true" file="${srcFile}" tofile="${dstFile}" />
</target>
Modified: incubator/xap/trunk/buildscripts/profiles/xap.profile.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildscripts/profiles/xap.profile.js?rev=434123&r1=434122&r2=434123&view=diff
==============================================================================
--- incubator/xap/trunk/buildscripts/profiles/xap.profile.js (original)
+++ incubator/xap/trunk/buildscripts/profiles/xap.profile.js Wed Aug 23 11:47:42 2006
@@ -14,27 +14,27 @@
"xap.macro.MacroNamespaceHandler",
"xap.xml.xmodify.XmodifyNamespaceHandler",
-
-
"xap.bridges.dojo.DojoWidgetBridge",
"xap.bridges.dojo.DojoButtonBridge",
"xap.bridges.dojo.DojoContentPaneBridge",
"xap.bridges.dojo.DojoFloatingPaneBridge",
"xap.bridges.dojo.DojoGenericWidgetBridge",
"xap.bridges.dojo.DojoLayoutPaneBridge",
-
"xap.bridges.dojo.DojoDatePickerBridge",
"xap.bridges.dojo.DojoColorPaletteBridge",
+
+
"xap.bridges.basic.DomNodeBridge",
"xap.bridges.basic.AbstractBlackBoxWidgetBridge",
+"xap.taghandling.AbstractTagImpl",
+"xap.bridges.basic.AbstractBlackBoxWidgetBridge",
+"xap.session.EventHandler",
+
-"xap.bridges.zimbra.DwtControlBridge",
-"xap.bridges.zimbra.DwtCompositeBridge",
-"xap.bridges.zimbra.DwtLabelBridge",
"xap.bridges.basic.TextViewBridge",
-"xap.bridges.zimbra.DwtButtonBridge",
+
"xap.bridges.google.GoogleBridge",
"xap.bridges.google.GoogleInfoWindowBridge",
@@ -45,6 +45,11 @@
"xap.bridges.google.GoogleMarkersBridge",
+
+"xap.bridges.zimbra.DwtControlBridge",
+"xap.bridges.zimbra.DwtCompositeBridge",
+"xap.bridges.zimbra.DwtLabelBridge",
+"xap.bridges.zimbra.DwtButtonBridge",
"xap.bridges.zimbra.DwtTabBridge",
"xap.bridges.zimbra.DwtTabViewBridge",
"xap.bridges.zimbra.DwtTextFieldBridge",