Revision: 5736
http://jnode.svn.sourceforge.net/jnode/?rev=5736&view=rev
Author: lsantha
Date: 2010-03-27 06:08:08 +0000 (Sat, 27 Mar 2010)
Log Message:
-----------
Added support for specifying in jnode.properties the target plugin list of the
jar packager.
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/build/packager/PackagerTask.java
trunk/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java
trunk/jnode.properties.dist
Modified: trunk/builder/src/builder/org/jnode/build/packager/PackagerTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/packager/PackagerTask.java
2010-03-27 05:39:07 UTC (rev 5735)
+++ trunk/builder/src/builder/org/jnode/build/packager/PackagerTask.java
2010-03-27 06:08:08 UTC (rev 5736)
@@ -58,6 +58,7 @@
// properties names
protected static final String USER_PLUGIN_IDS = "user.plugin.ids";
protected static final String PLUGIN_LIST_NAME = "plugin.list.name";
+ protected static final String TARGET_PLUGIN_LIST = "target.plugin.list";
protected static final String FORCE_OVERWRITE_SCRIPTS =
"force.overwrite.scripts";
/**
Modified:
trunk/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java
2010-03-27 05:39:07 UTC (rev 5735)
+++ trunk/builder/src/builder/org/jnode/build/packager/PluginListInsertor.java
2010-03-27 06:08:08 UTC (rev 5736)
@@ -63,9 +63,13 @@
*/
private List<String> readPluginIds(String pluginListName) {
List<String> pluginIds = new ArrayList<String>();
-
+
final Properties properties = getProperties();
- final String targetName = properties.getProperty(PLUGIN_LIST_NAME,
null);
+ String targetName = getProject().getProperty(TARGET_PLUGIN_LIST);
+ if (targetName == null || targetName.trim().length() == 0) {
+ targetName = properties.getProperty(PLUGIN_LIST_NAME, null);
+ }
+
if (targetName == null) {
log("property " + PLUGIN_LIST_NAME + " not specified in " +
getPropertiesFile().getAbsolutePath(), Project.MSG_ERR);
Modified: trunk/jnode.properties.dist
===================================================================
--- trunk/jnode.properties.dist 2010-03-27 05:39:07 UTC (rev 5735)
+++ trunk/jnode.properties.dist 2010-03-27 06:08:08 UTC (rev 5736)
@@ -17,6 +17,9 @@
# jar packager (tool to easily create a jnode plugin from a regular jar file)
# user.applications.dir = ${root.dir}/local/applications/
+# The jar packager adds the user plugins to the plugin list specified here.
+# target.plugin.list=default
+
# -----------------------------------------------
# Settings for the bootdisk image
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
