eclipse plugin: Flatten the feature project into...
...the main one and rename it to 'org.wesnoth'
This commit is contained in:
parent
2410c4ad0e
commit
a69c057b4d
11 changed files with 76 additions and 35 deletions
|
@ -73,8 +73,6 @@ subprocess.call( [
|
|||
"-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/build.xml" ):
|
||||
os.remove( "../org.wesnoth/build.xml" )
|
||||
if os.path.exists( "../org.wesnoth.ui/build.xml" ):
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<site>
|
||||
<feature url="features/org.wesnoth.feature_1.0.3.jar" id="org.wesnoth.feature" version="1.0.3" os="linux,macosx,win32">
|
||||
<feature url="features/org.wesnoth_1.0.3.jar" id="org.wesnoth" version="1.0.3" os="linux,macosx,win32">
|
||||
<category name="wesnoth_plugins"/>
|
||||
</feature>
|
||||
<category-def name="wesnoth_plugins" label="Wesnoth Plugins"/>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<description name="Wesnoth Eclipse Updates" url="http://eclipse.wesnoth.org/">
|
||||
The default update site for Wesnoth Eclipse Plugins
|
||||
</description>
|
||||
<feature url="features/org.wesnoth.feature_1.0.3.jar" id="org.wesnoth.feature" version="1.0.3" os="linux,macosx,win32">
|
||||
<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">
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>org.wesnoth.feature</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.FeatureBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
|
@ -1 +0,0 @@
|
|||
bin.includes = feature.xml
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
|
|
|
@ -4,6 +4,7 @@ source.. = src/,\
|
|||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
plugin.xml,\
|
||||
feature.xml,\
|
||||
*.xml,\
|
||||
icons/,\
|
||||
templates/,\
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<feature
|
||||
id="org.wesnoth.feature"
|
||||
id="org.wesnoth"
|
||||
label="Wesnoth User Made Content Plugin"
|
||||
version="1.0.3"
|
||||
provider-name="www.wesnoth.org"
|
||||
|
@ -215,10 +215,6 @@ litigation.
|
|||
<discovery label="Update site" url="http://eclipse.wesnoth.org/"/>
|
||||
</url>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.p2.user.ui"
|
||||
version="0.0.0"/>
|
||||
|
||||
<requires>
|
||||
<import plugin="org.eclipse.xtext"/>
|
||||
<import plugin="org.eclipse.xtext.util"/>
|
||||
|
@ -264,4 +260,60 @@ litigation.
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.commons.lang"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.ui.views.log"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.xtend.shared.ui"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.emf.mwe.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.emf.mwe.utils"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.commons.cli"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.emf.mwe2.runtime"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.emf.mwe.ui"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product name="Wesnoth UMC Dev" uid="org.wesnoth.product" id="org.wesnoth.product" application="org.wesnoth.application" version="1.0.3" useFeatures="false" includeLaunchers="true">
|
||||
<product name="Wesnoth UMC Dev" uid="org.wesnoth.product" id="org.wesnoth.product" application="org.wesnoth.application" version="1.0.3" useFeatures="true" includeLaunchers="true">
|
||||
|
||||
<aboutInfo>
|
||||
<image path="/org.wesnoth/icons/wesnoth-about.png"/>
|
||||
|
@ -401,11 +401,19 @@ litigation.
|
|||
</plugins>
|
||||
|
||||
<features>
|
||||
<feature id="org.eclipse.equinox.executable"/>
|
||||
<feature id="org.wesnoth.feature" version="1.0.3"/>
|
||||
<feature id="org.eclipse.rcp" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
|
||||
<feature id="org.eclipse.equinox.p2.discovery.feature" version="1.0.1.R36x_v20110210-4-09oB5865H6L02434"/>
|
||||
<feature id="org.eclipse.equinox.p2.user.ui" version="2.0.1.r361_v20100903-897HFa-FX0z-z-ntoaavz0JPX628"/>
|
||||
<feature id="org.eclipse.platform" version="3.7.0.v20110530-9gF7UHNFFt4cwE-pkZDJ7oz-mj4OSEIlu9SEv0f"/>
|
||||
<feature id="org.eclipse.rcp" version="3.7.0.v20110216-9DB5Fm1FpBGy_AaVz-mFamgY"/>
|
||||
<feature id="org.eclipse.xpand" version="1.1.0.v201106070515"/>
|
||||
<feature id="org.eclipse.xtend" version="1.1.0.v201106070515"/>
|
||||
<feature id="org.eclipse.jdt" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuLqBLqRja9B15B"/>
|
||||
<feature id="org.eclipse.emf.codegen" version="2.7.0.v20110606-0949"/>
|
||||
<feature id="org.eclipse.emf.codegen.ecore" version="2.7.0.v20110606-0949"/>
|
||||
<feature id="org.eclipse.emf.common" version="2.7.0.v20110605-0747"/>
|
||||
<feature id="org.eclipse.emf.ecore" version="2.7.0.v20110605-0747"/>
|
||||
<feature id="org.eclipse.emf" version="2.7.0.v20110606-0949"/>
|
||||
<feature id="org.eclipse.xtext.ui" version="2.0.0.v201106070531"/>
|
||||
<feature id="org.eclipse.xtext.runtime" version="2.0.0.v201106070531"/>
|
||||
<feature id="org.wesnoth" version="1.0.3"/>
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
|
|
|
@ -13,7 +13,7 @@ DEL keystore
|
|||
echo generating key...
|
||||
keytool.exe -genkey -dname "cn=Battle for Wesnoth, ou=Wesnoth, o=Wesnoth" -alias wesnoth -keypass %1 -keystore keystore -storepass %2 -validity 1095
|
||||
echo signing feature
|
||||
jarsigner.exe -keystore keystore -storepass %2 -keypass %1 ../update_site/features/org.wesnoth.feature_%PLUGIN_VERSION%.jar wesnoth
|
||||
jarsigner.exe -keystore keystore -storepass %2 -keypass %1 ../update_site/features/org.wesnoth_%PLUGIN_VERSION%.jar wesnoth
|
||||
echo signing org.wesnoth_%PLUGIN_VERSION%.jar
|
||||
jarsigner.exe -keystore keystore -storepass %2 -keypass %1 ../update_site/plugins/org.wesnoth_%PLUGIN_VERSION%.jar wesnoth
|
||||
echo signing org.wesnoth.ui_%PLUGIN_VERSION%.jar
|
Loading…
Add table
Reference in a new issue