Changeset 3984 in josm
- Timestamp:
- 2011-03-13T10:45:53+01:00 (14 years ago)
- Location:
- trunk/styles_nodist/potlatch2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/styles_nodist/potlatch2/README
r3902 r3984 1 1 The Potlatch 2 styles need to be patched in order to work with the JOSM MapCSS implementation. 2 2 3 The subversion externals definition has an explicit revision number set. 4 When updating from the remote repository, make sure to change the patched files accordingly. 3 Potlatch 2's repository is git://git.openstreetmap.org/potlatch2.git 5 4 6 The ant task 'assemble' concatinates the patched files to the final style potlatch2.mapcss 5 * 'source' contains the unmodified source files copied from git.openstreetmap.org/potlatch2.git/history/master:/resources/stylesheets. 6 * 'patched' contains the manually edited version. 7 * The ant task 'assemble' concatinates the patched files to the final style 'styles/standard/potlatch2.mapcss' 7 8 8 Another ant task 'update-externals' is a shortcut to change the svn property, such that the externals 9 points to the revision that is currently checked out. 9 When updating from upstream, keep all 3 in sync. 10 10 11 When committing, the following should be in sync: 12 * revision number in the svn externals property 13 * patched *.css files 14 * styles/standard/potlatch2.mapcss 11 At time of writing, the last update used 0f12f406e80e7cedb1ca9d4662ab2977077fdc79 but better check the commit dates as well. -
trunk/styles_nodist/potlatch2/build.xml
r3902 r3984 8 8 </concat> 9 9 </target> 10 11 12 <!-- update the explicit revision number in the externals definition to the currently checked out revison -->13 <target name="update-externals" depends="source-revision">14 <exec executable="svn">15 <arg value="propset"/>16 <arg value="svn:externals"/>17 <arg value="source -r ${version.entry.commit.revision} http://svn.openstreetmap.org/applications/editors/potlatch2/resources/stylesheets"/>18 <arg value="."/>19 </exec>20 </target>21 22 <!-- Determine revision and save in ${version.entry.commit.revision}-->23 <target name="source-revision">24 <exec append="false" output="REVISION.XML" executable="svn" dir="source" failifexecutionfails="true">25 <env key="LANG" value="C"/>26 <arg value="info"/>27 <arg value="--xml"/>28 <arg value="."/>29 </exec>30 <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>31 <delete file="REVISION.XML" />32 </target>33 34 10 </project> 35 11
Note:
See TracChangeset
for help on using the changeset viewer.