From: <mf...@us...> - 2011-09-25 18:35:27
|
Revision: 20018 http://jedit.svn.sourceforge.net/jedit/?rev=20018&view=rev Author: mf3 Date: 2011-09-25 18:35:18 +0000 (Sun, 25 Sep 2011) Log Message: ----------- Charactermap build.xml is more standard now. Modified Paths: -------------- plugins/CharacterMap/trunk/build.xml Added Paths: ----------- plugins/CharacterMap/trunk/build.properties.sample Added: plugins/CharacterMap/trunk/build.properties.sample =================================================================== --- plugins/CharacterMap/trunk/build.properties.sample (rev 0) +++ plugins/CharacterMap/trunk/build.properties.sample 2011-09-25 18:35:18 UTC (rev 20018) @@ -0,0 +1,21 @@ +### +### build.properties file for CharacterMap plugin +### + + +### Directory must be set to the installed jedit.jar +### e.g. "../.." or "C:/Program Files/jEdit" etc. --> + +# jedit.install.dir=../.. + +### Directory of jEdit settings. Default: +### ${user.home}/.jedit +### If you are compiling inside jEdit and charactermap plugin is open, use e.g. +### ${user.home}/.jedit-test --> + +# jedit.setting.dir=${user.home}/.jedit + +### Where to install the plugins + +# jedit.plugin.dir=${jedit.setting.dir}/jars + Modified: plugins/CharacterMap/trunk/build.xml =================================================================== --- plugins/CharacterMap/trunk/build.xml 2011-09-24 13:09:51 UTC (rev 20017) +++ plugins/CharacterMap/trunk/build.xml 2011-09-25 18:35:18 UTC (rev 20018) @@ -6,101 +6,102 @@ The 'dist' target compiles the plugin and creates the JAR file in project parent folder. Deletes temporary files. - The 'install' target compiles the plugin and creates the JAR file - in a test folder. + The 'install' target compiles the plugin and creates the JAR file. - The 'run' target starts jEdit using the installed plugin from the - test folder. + The 'run' target starts jEdit using the installed plugin. --> <project name="charactermap" default="dist" basedir="."> - <!-- Directory where the final artifacts will be installed to --> - <property name="install.dir" value=".." /> + <!-- read build.properties --> + <property file="../build.properties"/> + <property file="build.properties"/> - <!-- Directory must be set to the installed jedit.jar - e.g. "../.." or "C:/Program Files/jEdit" --> - <property name="jedit.install.dir" value="C:/Program Files/JEdit"/> + <!-- Directory containing the distribution --> + <property name="dist.dir" value=".."/> - <!-- Directory containing the distribution. - default: Project parent directory ".." --> - <property name="dist.dir" value="${install.dir}"/> - - <!-- Directory of jEdit test settings - default: "${user.home}/.jedit-test" --> - <property name="jedit.setting.dir" value="${user.home}/.jedit-test"/> + <!-- Directory of build-files --> + <property name="build.dir" value="build"/> - <!-- Directory of installed plugins. - default: ${jedit.setting.dir}/jar--> - <property name="jedit.plugins.dir" value="${jedit.setting.dir}/jars"/> + <property name="jar.name" value="CharacterMap.jar"/> + <property name="src.dir" value="."/> + <property name="build.dir" value="build"/> + + <fail message="Set correct directories in build.properties"> + <condition> + <or> + <not><available file="${jedit.install.dir}/jedit.jar"/></not> + <not><isset property="jedit.setting.dir"/></not> + <not><isset property="jedit.plugin.dir"/></not> + </or> + </condition> + </fail> - <property name="jar.name" value="CharacterMap.jar"/> - <property name="src.dir" value="."/> - <property name="build.dir" value="build"/> + <path id="project.class.path"> + <pathelement location="${jedit.install.dir}/jedit.jar"/> + <pathelement location="."/> + </path> - <fail message="Set correct jEdit install dir in build.xml"> - <condition> - <not> - <available file="${jedit.install.dir}/jedit.jar"/> - </not> - </condition> - </fail> - - <path id="project.class.path"> - <pathelement location="${jedit.install.dir}/jedit.jar"/> - <pathelement location="."/> - </path> - - <fileset id="jar-build" dir="${build.dir}"/> - <fileset id="jar-src" dir="${src.dir}"> - <include name="dockables.xml"/> - <include name="*.props"/> - <include name="*.html"/> - </fileset> + <fileset id="jar-build" dir="${build.dir}"/> + <fileset id="jar-src" dir="${src.dir}"> + <include name="dockables.xml"/> + <include name="*.props"/> + <include name="*.html"/> + </fileset> - - <target name="compile"> - <mkdir dir="${build.dir}"/> - <javac srcdir="${src.dir}" destdir="${build.dir}" debug="on" deprecation="on" includeJavaRuntime="yes" includeAntRuntime="no"> - <compilerarg value="-Xlint"/> - <compilerarg value="-Xlint:-serial"/> - <classpath refid="project.class.path"/> - </javac> - </target> - - <target name="dist" depends="compile"> - <!-- remove warn (Win-FAT32) "*.class modified in future" --> - <sleep seconds="2"/> - <mkdir dir="${dist.dir}"/> - <jar jarfile="${dist.dir}/${jar.name}"> - <fileset refid="jar-build"/> - <fileset refid="jar-src"/> - </jar> - <antcall target="clean"/> - </target> - - <target name="install" depends="compile"> - <sleep seconds="2"/> - <mkdir dir="${jedit.setting.dir}"/> - <mkdir dir="${jedit.plugins.dir}"/> - <jar jarfile="${jedit.plugins.dir}/${jar.name}"> - <fileset refid="jar-build"/> - <fileset refid="jar-src"/> - </jar> - </target> - - <target name="run" depends="install"> - <!-- code from jEdit's original build.xml --> - <java jar="${jedit.install.dir}/jedit.jar" fork="true" spawn="true" maxmemory="192M"> - <arg value="-settings=${jedit.setting.dir}"/> - </java> - </target> - - <target name="clean"> - <delete dir="${build.dir}"/> - <delete> - <fileset dir="." includes="**/*~" defaultexcludes="no"/> - </delete> - </target> + <target name="compile"> + <mkdir dir="${build.dir}"/> + <javac + srcdir="${src.dir}" + destdir="${build.dir}" + debug="on" + deprecation="on" + includeJavaRuntime="yes" + includeAntRuntime="no" + > + <compilerarg value="-Xlint"/> + <compilerarg value="-Xlint:-serial"/> + <classpath refid="project.class.path"/> + </javac> + </target> + + <target name="dist" depends="compile"> + <!-- remove warn (Win-FAT32) "*.class modified in future" --> + <sleep seconds="2"/> + <mkdir dir="${dist.dir}"/> + <jar jarfile="${dist.dir}/${jar.name}"> + <fileset refid="jar-build"/> + <fileset refid="jar-src"/> + </jar> + <antcall target="clean"/> + </target> + + <target name="install" depends="compile"> + <sleep seconds="2"/> + <mkdir dir="${jedit.setting.dir}"/> + <mkdir dir="${jedit.plugin.dir}"/> + <jar jarfile="${jedit.plugin.dir}/${jar.name}"> + <fileset refid="jar-build"/> + <fileset refid="jar-src"/> + </jar> + </target> + + <target name="run" depends="install"> + <!-- code from jEdit's original build.xml --> + <java jar="${jedit.install.dir}/jedit.jar" + fork="true" + spawn="true" + maxmemory="192M"> + <arg value="-settings=${jedit.setting.dir}"/> + </java> + </target> + + <target name="clean"> + <delete dir="${build.dir}"/> + <delete> + <fileset dir="." includes="**/*~" defaultexcludes="no"/> + </delete> + </target> + </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |