Author: timotei
Date: Sun May 22 22:13:40 2011
New Revision: 49629
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49629&view=rev
Log:
eclipse plugin: Miscellanous build-related updates
Modified:
trunk/utils/java/org.wesnoth.build/build.cmd
trunk/utils/java/org.wesnoth.build/build.properties
trunk/utils/java/org.wesnoth.build/build.sh
trunk/utils/java/org.wesnoth.build/build.xml
trunk/utils/java/org.wesnoth/src/org/wesnoth/product/ApplicationActionBarAdvisor.java
Modified: trunk/utils/java/org.wesnoth.build/build.cmd
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth.build/build.cmd?rev=49629&r1=49628&r2=49629&view=diff
==============================================================================
--- trunk/utils/java/org.wesnoth.build/build.cmd (original)
+++ trunk/utils/java/org.wesnoth.build/build.cmd Sun May 22 22:13:40 2011
@@ -29,6 +29,7 @@
java -cp %EQUINOXJAR% org.eclipse.core.launcher.Main -data workspace
-application org.eclipse.ant.core.antRunner -DbuildDirectory=%BUILDDIR%
-Dbase=%ECLIPSEBIN% -DbaseLocation=%ECLIPSEBIN% -Ddeltapack=%ECLIPSEBIN%
-Declipse.pdebuild.scripts=%PDEBUILD_DIR%\scripts
-Declipse.pdebuild.templates=%PDEBUILD_DIR%\templates -buildfile build.xml
+IF EXIST ../org.wesnoth.feature/build.xml rm ../org.wesnoth.feature/build.xml
IF EXIST ../org.wesnoth/build.xml rm ../org.wesnoth/build.xml
IF EXIST ../org.wesnoth.wml/build.xml rm ../org.wesnoth.wml/build.xml
IF EXIST ../org.wesnoth.wml.ui/build.xml rm ../org.wesnoth.wml.ui/build.xml
Modified: trunk/utils/java/org.wesnoth.build/build.properties
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth.build/build.properties?rev=49629&r1=49628&r2=49629&view=diff
==============================================================================
--- trunk/utils/java/org.wesnoth.build/build.properties (original)
+++ trunk/utils/java/org.wesnoth.build/build.properties Sun May 22 22:13:40 2011
@@ -54,7 +54,7 @@
parallelThreadsPerProcessor=1
#Set to true if you want the output to be ready for an update jar (no site.xml
generated)
-outputUpdateJars = false
+outputUpdateJars = true
#Set to true if you want to sign jars
#signJars=false
Modified: trunk/utils/java/org.wesnoth.build/build.sh
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth.build/build.sh?rev=49629&r1=49628&r2=49629&view=diff
==============================================================================
--- trunk/utils/java/org.wesnoth.build/build.sh (original)
+++ trunk/utils/java/org.wesnoth.build/build.sh Sun May 22 22:13:40 2011
@@ -48,6 +48,10 @@
then
rm ../org.wesnoth/build.xml
fi
+if [[ -f "../org.wesnoth.feature/build.xml" ]]
+then
+ rm ../org.wesnoth.feature/build.xml
+fi
if [[ -f "../org.wesnoth.wml/build.xml" ]]
then
rm ../org.wesnoth.wml/build.xml
Modified: trunk/utils/java/org.wesnoth.build/build.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth.build/build.xml?rev=49629&r1=49628&r2=49629&view=diff
==============================================================================
--- trunk/utils/java/org.wesnoth.build/build.xml (original)
+++ trunk/utils/java/org.wesnoth.build/build.xml Sun May 22 22:13:40 2011
@@ -5,7 +5,7 @@
<fail unless="haveBaseLocation" message="Please set the base location
for the eclipse installation." />
<available property="haveBuildDirectory" file="${buildDirectory}"/>
- <fail unless="haveBuildDirectory" message="Please set the base
location for the eclipse installation." />
+ <fail unless="haveBuildDirectory" message="Please set the build
location." />
<!-- Check that we have a deltapack -->
<available property="haveDeltaPack" file="${deltapack}"/>
Modified:
trunk/utils/java/org.wesnoth/src/org/wesnoth/product/ApplicationActionBarAdvisor.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/java/org.wesnoth/src/org/wesnoth/product/ApplicationActionBarAdvisor.java?rev=49629&r1=49628&r2=49629&view=diff
==============================================================================
---
trunk/utils/java/org.wesnoth/src/org/wesnoth/product/ApplicationActionBarAdvisor.java
(original)
+++
trunk/utils/java/org.wesnoth/src/org/wesnoth/product/ApplicationActionBarAdvisor.java
Sun May 22 22:13:40 2011
@@ -86,8 +86,8 @@
@Override
protected void fillCoolBar(ICoolBarManager coolBar)
{
- IActionBarConfigurer config = getActionBarConfigurer();
- System.out.println(config.toString());
+ //IActionBarConfigurer config = getActionBarConfigurer();
+ //System.out.println(config.toString());
for(IWorkbenchAction action : coolBarActions_){
coolBar.add(action);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
