[ jEdit-commits ] SF.net SVN: jedit:[20022] plugins/CharacterMap/trunk

[<mf...@us...>]

Revision: 20022
          http://jedit.svn.sourceforge.net/jedit/?rev=20022&view=rev
Author:   mf3
Date:     2011-09-26 01:21:22 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Charactermap build.xml + build.properties.sample again

Modified Paths:
--------------
    plugins/CharacterMap/trunk/build.properties.sample
    plugins/CharacterMap/trunk/build.xml

Modified: plugins/CharacterMap/trunk/build.properties.sample
===================================================================
--- plugins/CharacterMap/trunk/build.properties.sample	2011-09-26 00:02:35 UTC (rev 20021)
+++ plugins/CharacterMap/trunk/build.properties.sample	2011-09-26 01:21:22 UTC (rev 20022)
@@ -15,7 +15,7 @@
 
 # jedit.setting.dir=${user.home}/.jedit
 
-### Where to install the plugins
+### Where to install the plugins.
 
-# jedit.plugin.dir=${jedit.setting.dir}/jars
+# jedit.plugins.dir=${jedit.setting.dir}/jars
 

Modified: plugins/CharacterMap/trunk/build.xml
===================================================================
--- plugins/CharacterMap/trunk/build.xml	2011-09-26 00:02:35 UTC (rev 20021)
+++ plugins/CharacterMap/trunk/build.xml	2011-09-26 01:21:22 UTC (rev 20022)
@@ -31,8 +31,7 @@
             <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>
+                <not><isset property="jedit.plugins.dir"/></not>
             </or>
             </condition>
         </fail>
@@ -79,15 +78,20 @@
 
 	<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}">
+		<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">
+		<fail message="Specify setting directory in build.properties">
+		    <condition>
+			<not><isset property="jedit.setting.dir"/></not>
+		    </condition>
+		</fail>
+		<mkdir dir="${jedit.setting.dir}"/>
 	        <!-- code from jEdit's original build.xml -->
 		<java jar="${jedit.install.dir}/jedit.jar"
 		      fork="true"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.