Author: timotei
Date: Thu Aug 4 21:11:44 2011
New Revision: 50593
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50593&view=rev
Log:
eclipse plugin: Tweak a bit the PDE Build. Now,
the built standalone + update site works
as intended.
Removed:
trunk/utils/umc_dev/build/site.xml
Modified:
trunk/utils/umc_dev/build/SConstruct
trunk/utils/umc_dev/build/build.properties
trunk/utils/umc_dev/build/build.xml
Modified: trunk/utils/umc_dev/build/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/build/SConstruct?rev=50593&r1=50592&r2=50593&view=diff
==============================================================================
--- trunk/utils/umc_dev/build/SConstruct (original)
+++ trunk/utils/umc_dev/build/SConstruct Thu Aug 4 21:11:44 2011
@@ -73,15 +73,22 @@
"-buildfile", "build.xml" ] )
# Some cleanup
-if os.path.exists( "../org.wesnoth.feature/build.xml" ):
- os.remove( "../org.wesnoth.feature/build.xml" )
-if os.path.exists( "../org.wesnoth.feature/feature.temp.folder" ):
- os.remove( "../org.wesnoth.feature/feature.temp.folder" )
-if os.path.exists( "../org.wesnoth/build.xml" ):
- os.remove( "../org.wesnoth/build.xml" )
-if os.path.exists( "../org.wesnoth.ui/build.xml" ):
- os.remove( "../org.wesnoth.ui/build.xml" )
+print "Cleaning up..."
+# Some cleanup
+to_cleanup = [
+ "../org.wesnoth.feature/build.xml",
+ "../org.wesnoth/build.xml",
+ "../org.wesnoth.ui/build.xml",
+ "../org.wesnoth/javaCompiler...args",
+ "../org.wesnoth.ui/javaCompiler...args" ]
+for cleanup_file in to_cleanup:
+ try: os.remove( cleanup_file )
+ except: pass
+
+try: shutil.rmtree( "../org.wesnoth.feature/feature.temp.folder" )
+except: pass
+
# Local variables:
# mode: python
# end:
Modified: trunk/utils/umc_dev/build/build.properties
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/build/build.properties?rev=50593&r1=50592&r2=50593&view=diff
==============================================================================
--- trunk/utils/umc_dev/build/build.properties (original)
+++ trunk/utils/umc_dev/build/build.properties Thu Aug 4 21:11:44 2011
@@ -20,8 +20,7 @@
p2.build.repo=file:${buildDirectory}/repository
p2.metadata.repo=file:${buildDirectory}/repository
p2.artifact.repo=file:${buildDirectory}/repository
-p2.category.site=file:${basedir}/site.xml
-p2.category.definition=file:${basedir}/category.xml
+p2.category.definition=file:${basedir}/../org.wesnoth.feature/category.xml
#Set the name of the archive that will result from the product build.
archiveNamePrefix=wesnoth_umc_dev
@@ -37,10 +36,10 @@
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
configs=win32, win32, x86 &\
- win32,win32,x86_64 & \
- linux, gtk, x86 & \
- linux, gtk, x86_64 & \
- macosx, cocoa, x86_64
+ win32,win32,x86_64 & \
+ linux, gtk, x86 & \
+ linux, gtk, x86_64 & \
+ macosx, cocoa, x86_64
#Allow cycles involving at most one bundle that needs to be compiled with the
rest being binary bundles.
allowBinaryCycles = true
Modified: trunk/utils/umc_dev/build/build.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/build/build.xml?rev=50593&r1=50592&r2=50593&view=diff
==============================================================================
--- trunk/utils/umc_dev/build/build.xml (original)
+++ trunk/utils/umc_dev/build/build.xml Thu Aug 4 21:11:44 2011
@@ -9,24 +9,32 @@
<!-- Check that we have a deltapack -->
<available property="haveDeltaPack" file="${deltapack}"/>
- <fail unless="haveDeltaPack" message="The deltapack is required to
build this product. Please edit buildProduct.xml or set the
"deltapack" property." />
-
+ <fail unless="haveDeltaPack" message="The deltapack is required to
build this product. Please set the "deltapack" property." />
+
<property name="builder" value="${basedir}" />
<property name="buildDirectory" value="${basedir}/buildDirectory"/>
<property name="pluginPath"
value="${basedir}/..${path.separator}${deltapack}" />
<property name="buildTempFolder" value="${buildDirectory}" />
-
+
+ <!-- clear previous builds -->
+ <delete>
+ <fileset dir="${basedir}/update_site"/>
+ </delete>
+ <delete>
+ <fileset dir="${basedir}/${buildLabel}"/>
+ </delete>
+
<ant
antfile="${eclipse.pdebuild.scripts}/productBuild/productBuild.xml" />
<move todir="${basedir}/${buildLabel}">
<fileset dir="${buildDirectory}/${buildLabel}" includes="*.zip"/>
</move>
+
<move todir="${basedir}/update_site">
<fileset dir="${buildDirectory}/repository"/>
</move>
- <delete>
- <fileset dir="${basedir}/update_site/binary" />
- </delete>
+
+ <!-- remove non-wesnoth plugins -->
<delete>
<fileset dir="${basedir}/update_site/plugins">
<exclude name="org.wesnoth*"/>
@@ -34,4 +42,3 @@
</delete>
</target>
</project>
-
Removed: trunk/utils/umc_dev/build/site.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/build/site.xml?rev=50592&view=auto
==============================================================================
--- trunk/utils/umc_dev/build/site.xml (original)
+++ trunk/utils/umc_dev/build/site.xml (removed)
@@ -1,14 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description name="Wesnoth Eclipse Updates"
url="http://eclipse.wesnoth.org/";>
- The default update site for Wesnoth Eclipse Plugins
- </description>
- <feature url="features/org.wesnoth_1.0.3.jar" id="org.wesnoth"
version="1.0.3" os="linux,macosx,win32">
- <category name="Wesnoth_Eclipse_Plugins"/>
- </feature>
- <category-def name="Wesnoth_Eclipse_Plugins" label="Wesnoth Eclipse
Plugins">
- <description>
- This category contains the Wesnoth Eclipse Tools
- </description>
- </category-def>
-</site>
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
