diff options
| author | Marko Grönroos <magi@iki.fi> | 2009-04-07 13:50:23 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2009-04-07 13:50:23 +0000 |
| commit | 94f6a844627cbba41a6f1e980d1f08bedfcb3ef5 (patch) | |
| tree | 0dd49da061fbc77a794a95c96fb99b66161d02f5 /build/package | |
| parent | 07203b799722834cf51ac667add85d495225ceba (diff) | |
| download | vaadin-framework-94f6a844627cbba41a6f1e980d1f08bedfcb3ef5.tar.gz vaadin-framework-94f6a844627cbba41a6f1e980d1f08bedfcb3ef5.zip | |
Merge from versions/5.4 to versions/6.0:
Merged [7302]: Removed obsolete testing scripts for Testing Tools 1.0.
Merged [7305]: Initial testing tools target, doesn't quite work yet, demo launching is missing, etc.
Merged [7321]: Moved build/docbook directory from 5.4 branch to doc tree.
Merged [7325]: Moved XEP directory from 5.4 branch to doc tree.
Merged [7333]: Removed all manual related material and build instructions from regular toolkit branch.
Merged [7342]: Building manual from the toolkit build script.
Merged [7343]: Fixed a namespace problem in build file and organized clean-up targets a little.
Merged [7346]: Removed the obsolete DTDs.
Merged [7348]: Changed <version> and <platform> tags in some HTML and text files to @...@ notation to avoid some validation errors in Eclipse.
svn changeset:7352/svn branch:6.0
Diffstat (limited to 'build/package')
| -rw-r--r-- | build/package/build-widgetset.xml | 4 | ||||
| -rw-r--r-- | build/package/eclipse-IT Mill Toolkit Hosted Mode-launch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml index ec400c2d70..2a82e5fd4b 100644 --- a/build/package/build-widgetset.xml +++ b/build/package/build-widgetset.xml @@ -31,13 +31,13 @@ See configure target to adjust this buildfile. <property name="base" value="../../../" /> <!-- which platform we are in, possible values are windows, linux and mac --> - <property name="gwt-platform" value="<platform></platform>" /> + <property name="gwt-platform" value="@platform@" /> <!-- where platform specific GWT distribution is located --> <property name="gwt-location" value="${base}gwt" /> <!-- where Toolkit jar is located --> - <property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" /> + <property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/itmill-toolkit-@version@.jar" /> <!-- where project client-side widgetset source files are located --> <property name="client-side-src-location" value="${base}WebContent/WEB-INF/src" /> diff --git a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch index 3ae558420a..7479aeb801 100644 --- a/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch +++ b/build/package/eclipse-IT Mill Toolkit Hosted Mode-launch @@ -2,7 +2,7 @@ <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT Mill Toolkit Hosted Mode.launch"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar"/> +<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-@platform@.jar"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="1"/> |