Author: timotei
Date: Thu Aug 4 21:11:04 2011
New Revision: 50591
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50591&view=rev
Log:
eclipse plugin: Work a bit more on the updating
mechanism
Added:
trunk/utils/umc_dev/org.wesnoth.feature/category.xml
- copied, changed from r50590, trunk/utils/umc_dev/build/category.xml
Removed:
trunk/utils/umc_dev/build/category.xml
trunk/utils/umc_dev/org.wesnoth/buckminster.properties
Modified:
trunk/utils/umc_dev/org.wesnoth.feature/feature.xml
trunk/utils/umc_dev/org.wesnoth/org.wesnoth.product
trunk/utils/umc_dev/org.wesnoth/p2.inf
trunk/utils/umc_dev/org.wesnoth/plugin.xml
Removed: trunk/utils/umc_dev/build/category.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/build/category.xml?rev=50590&view=auto
==============================================================================
--- trunk/utils/umc_dev/build/category.xml (original)
+++ trunk/utils/umc_dev/build/category.xml (removed)
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <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"/>
-</site>
Copied: trunk/utils/umc_dev/org.wesnoth.feature/category.xml (from r50590,
trunk/utils/umc_dev/build/category.xml)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.feature/category.xml?p2=trunk/utils/umc_dev/org.wesnoth.feature/category.xml&p1=trunk/utils/umc_dev/build/category.xml&r1=50590&r2=50591&rev=50591&view=diff
==============================================================================
--- trunk/utils/umc_dev/build/category.xml (original)
+++ trunk/utils/umc_dev/org.wesnoth.feature/category.xml Thu Aug 4 21:11:04
2011
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <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"/>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.wesnoth_1.0.3.jar" id="org.wesnoth"
version="1.0.3" os="linux,macosx,win32">
+ <category name="org.wesnoth.plugins"/>
+ </feature>
+ <category-def name="org.wesnoth.plugins" label="Wesnoth Plugins"/>
+</site>
Modified: trunk/utils/umc_dev/org.wesnoth.feature/feature.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.feature/feature.xml?rev=50591&r1=50590&r2=50591&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth.feature/feature.xml (original)
+++ trunk/utils/umc_dev/org.wesnoth.feature/feature.xml Thu Aug 4 21:11:04 2011
@@ -2,7 +2,7 @@
<feature
id="org.wesnoth"
label="Wesnoth User Made Content Plugin"
- version="1.0.3"
+ version="1.0.4"
provider-name="www.wesnoth.org"
os="linux,macosx,win32">
@@ -221,7 +221,6 @@
<import plugin="org.eclipse.emf.ecore"/>
<import plugin="org.eclipse.emf.common"/>
<import plugin="org.antlr.runtime"/>
- <import plugin="org.eclipse.xtext.junit" version="1.0.0"
match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.util" version="3.2.100"
match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.6.0"
match="greaterOrEqual"/>
<import plugin="org.apache.log4j"/>
@@ -231,7 +230,6 @@
<import plugin="org.eclipse.xtext.ui.shared"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.xtext.builder"/>
- <import plugin="org.eclipse.xtext.xtext.ui" version="1.0.0"
match="greaterOrEqual"/>
<import plugin="org.eclipse.core.filesystem" version="1.3.0"
match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
@@ -275,13 +273,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.xtend.shared.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.cli"
download-size="0"
install-size="0"
@@ -338,27 +329,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.xpand"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xtend"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.xtend.typesystem.emf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jdt.ui"
download-size="0"
install-size="0"
@@ -434,4 +404,25 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.converter"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.codegen.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.codegen"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Removed: trunk/utils/umc_dev/org.wesnoth/buckminster.properties
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/buckminster.properties?rev=50590&view=auto
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/buckminster.properties (original)
+++ trunk/utils/umc_dev/org.wesnoth/buckminster.properties (removed)
@@ -1,8 +1,0 @@
-# Where all the output should go
-buckminster.output.root=${user.home}/_demosite
-# Where the temp files should go
-buckminster.temp.root=${user.home}/_demosite/demosite.tmp
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-# don't generate source code
-cbi.include.source=false
Modified: trunk/utils/umc_dev/org.wesnoth/org.wesnoth.product
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/org.wesnoth.product?rev=50591&r1=50590&r2=50591&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/org.wesnoth.product (original)
+++ trunk/utils/umc_dev/org.wesnoth/org.wesnoth.product Thu Aug 4 21:11:04 2011
@@ -405,13 +405,22 @@
<feature id="org.eclipse.xtext.runtime" version="2.0.0.v201106070531"/>
<feature id="org.eclipse.platform"
version="3.7.0.v20110530-9gF7UHNFFt4cwE-pkZDJ7oz-mj4OSEIlu9SEv0f"/>
<feature id="org.eclipse.xtext.ui" version="2.0.0.v201106070531"/>
+ <feature id="org.eclipse.equinox.p2.user.ui"
version="2.1.1.v20110526-6-Bg9JXOePwKUTU7X0teV1RtDu-e"/>
+ <feature id="org.eclipse.emf.mwe.ui" version="1.1.0.v201106070424"/>
+ <feature id="org.eclipse.xpand" version="1.1.0.v201106070515"/>
+ <feature id="org.eclipse.xpand.ui" version="1.1.0.v201106070515"/>
+ <feature id="org.eclipse.xtend" version="1.1.0.v201106070515"/>
+ <feature id="org.eclipse.xtend.dependencies"
version="1.1.0.v201106070515"/>
+ <feature id="org.eclipse.xtend.typesystem.emf"
version="1.1.0.v201106070515"/>
+ <feature id="org.eclipse.xtend.ui" version="1.1.0.v201106070515"/>
</features>
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2"
/>
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true"
startLevel="2" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true"
startLevel="1" />
+ <plugin id="org.wesnoth" autoStart="false" startLevel="5" />
</configurations>
</product>
Modified: trunk/utils/umc_dev/org.wesnoth/p2.inf
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/p2.inf?rev=50591&r1=50590&r2=50591&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/p2.inf (original)
+++ trunk/utils/umc_dev/org.wesnoth/p2.inf Thu Aug 4 21:11:04 2011
@@ -1,3 +1,3 @@
instructions.configure=\
- addRepository(name:Wesnoth Plugins Update
Site,type:0,location:http://eclipse.wesnoth.org/);\
- addRepository(name:Wesnoth Plugins Update
Site,type:1,location:http://eclipse.wesnoth.org/);
+ addRepository(name:Wesnoth Plugins Update
Site,type:0,location:http${#58}//eclipse.wesnoth.org/);\
+ addRepository(name:Wesnoth Plugins Update
Site,type:1,location:http${#58}//eclipse.wesnoth.org/);
Modified: trunk/utils/umc_dev/org.wesnoth/plugin.xml
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/plugin.xml?rev=50591&r1=50590&r2=50591&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/plugin.xml (original)
+++ trunk/utils/umc_dev/org.wesnoth/plugin.xml Thu Aug 4 21:11:04 2011
@@ -590,12 +590,12 @@
description="Reloads all plugin related files"
id="org.wesnoth.commands.reloadFiles"
name="reloadFiles">
- </command>
+ </command><!--
<command
defaultHandler="org.wesnoth.handlers.TestHandler"
id="org.wesnoth.commands.test"
name="test command">
- </command>
+ </command>-->
</extension>
<extension
point="org.eclipse.ui.menus">
@@ -657,7 +657,7 @@
name="preferencePageId"
value="org.wesnoth.preferences.UMCPage">
</parameter>
- </command>
+ </command><!--
<separator
name="separator3"
visible="true">
@@ -666,7 +666,7 @@
commandId="org.wesnoth.commands.test"
label="Test (FOR DEBUG ONLY!!)"
style="push">
- </command>
+ </command> -->
</menu>
</menuContribution>
</extension>
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
