From 1e09f27b372eb0b9bb028a2684663b87b7317e6d Mon Sep 17 00:00:00 2001
From: Timotei Dolean <timotei21@gmail.com>
Date: Thu, 4 Aug 2011 19:09:59 +0000
Subject: [PATCH] eclipse plugin: Revert part of the flattening commit.

It seems the PDE Build needs a separate directory for the feature
---
 utils/umc_dev/build/SConstruct                  |  2 ++
 .../umc_dev/{org.wesnoth => build}/signing.cmd  |  0
 utils/umc_dev/org.wesnoth.feature/.project      | 17 +++++++++++++++++
 .../org.wesnoth.feature/build.properties        |  1 +
 .../feature.xml                                 |  0
 utils/umc_dev/org.wesnoth/build.properties      |  1 -
 6 files changed, 20 insertions(+), 1 deletion(-)
 rename utils/umc_dev/{org.wesnoth => build}/signing.cmd (100%)
 create mode 100644 utils/umc_dev/org.wesnoth.feature/.project
 create mode 100644 utils/umc_dev/org.wesnoth.feature/build.properties
 rename utils/umc_dev/{org.wesnoth => org.wesnoth.feature}/feature.xml (100%)

diff --git a/utils/umc_dev/build/SConstruct b/utils/umc_dev/build/SConstruct
index 0fd0920a23a..db5b0ff0514 100644
--- a/utils/umc_dev/build/SConstruct
+++ b/utils/umc_dev/build/SConstruct
@@ -73,6 +73,8 @@ 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" ):
diff --git a/utils/umc_dev/org.wesnoth/signing.cmd b/utils/umc_dev/build/signing.cmd
similarity index 100%
rename from utils/umc_dev/org.wesnoth/signing.cmd
rename to utils/umc_dev/build/signing.cmd
diff --git a/utils/umc_dev/org.wesnoth.feature/.project b/utils/umc_dev/org.wesnoth.feature/.project
new file mode 100644
index 00000000000..1f32bb8103f
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.feature/.project
@@ -0,0 +1,17 @@
+<?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>
diff --git a/utils/umc_dev/org.wesnoth.feature/build.properties b/utils/umc_dev/org.wesnoth.feature/build.properties
new file mode 100644
index 00000000000..82ab19c62d1
--- /dev/null
+++ b/utils/umc_dev/org.wesnoth.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/utils/umc_dev/org.wesnoth/feature.xml b/utils/umc_dev/org.wesnoth.feature/feature.xml
similarity index 100%
rename from utils/umc_dev/org.wesnoth/feature.xml
rename to utils/umc_dev/org.wesnoth.feature/feature.xml
diff --git a/utils/umc_dev/org.wesnoth/build.properties b/utils/umc_dev/org.wesnoth/build.properties
index 6d871546a53..4d1e14ba889 100644
--- a/utils/umc_dev/org.wesnoth/build.properties
+++ b/utils/umc_dev/org.wesnoth/build.properties
@@ -4,7 +4,6 @@ source.. = src/,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               feature.xml,\
                *.xml,\
                icons/,\
                templates/,\