BUG-1053 added external run.bat for supp of13 on windows && edited bin.xml for genera...

Change-Id: I8173665cdd4454efda5257dad6279bb55e48b19a
Signed-off-by: Jakub <jatoth@cisco.com>

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index 9a9564779de780f49fad48a412dce09a7d4bc97d..022ff4c643d7e080d00ae9650ebcaa30946e9551 100644 (file)
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -45,6 +45,7 @@
       <outputDirectory>/</outputDirectory>
       <excludes>
           <exclude>opendaylight/run.sh</exclude>
+          <exclude>opendaylight/run.bat</exclude>
           <exclude>opendaylight/plugins/org.opendaylight.controller.protocol_plugins.openflow-*.jar</exclude>
           <exclude>opendaylight/plugins/org.opendaylight.controller.thirdparty.org.openflow.openflowj-*.jar</exclude>
       </excludes>
@@ -64,10 +65,21 @@
       <destName>run.internal.sh</destName>
       <fileMode>0755</fileMode>
     </file>
+    <file>
+      <source>${project.build.directory}/generated-resources/opendaylight/run.bat</source>
+      <outputDirectory>/opendaylight/</outputDirectory>
+      <destName>run.internal.bat</destName>
+      <fileMode>0755</fileMode>
+    </file>
     <file>
       <source>${basedir}/src/assemble/resources/run.sh</source>
       <outputDirectory>/opendaylight/</outputDirectory>
       <fileMode>0755</fileMode>
     </file>
+    <file>
+      <source>${basedir}/src/assemble/resources/run.bat</source>
+      <outputDirectory>/opendaylight/</outputDirectory>
+      <fileMode>0755</fileMode>
+    </file>
   </files>
 </assembly>

diff --git a/distributions/base/src/assemble/resources/run.bat b/distributions/base/src/assemble/resources/run.bat
new file mode 100644 (file)
index 0000000..e3ddb19
--- /dev/null
+++ b/distributions/base/src/assemble/resources/run.bat
@@ -0,0 +1,53 @@
+@ECHO OFF\r
+SETLOCAL ENABLEDELAYEDEXPANSION\r
+\r
+SET CONTROLLER_RUNBAT=run.internal.bat\r
+SET OF_FILTER=\r
+SET OF13=0\r
+SET BUNDLEFILTER=\r
+\r
+:LOOP\r
+IF "%~1" NEQ "" (\r
+    SET CARG=%~1\r
+    IF "!CARG!"=="-of13" (\r
+       SET OF13=1\r
+       SHIFT\r
+       GOTO :LOOP\r
+    )\r
+\r
+    SET BUNDLEFILTER= !BUNDLEFILTER! !CARG!\r
+    SHIFT\r
+    GOTO :LOOP \r
+)\r
+\r
+dir /b configuration\initial>initial.txt\r
+dir /b configuration\initial.available>initial.available.txt\r
+\r
+REM clean available optional configurations\r
+for /f %%b in (initial.available.txt) do (\r
+      set foob=%%b\r
+            for /f %%a in (initial.txt) do (\r
+                set fooa=%%a\r
+                if !fooa!==!foob! (\r
+                     del configuration\initial\!foob!\r
+                ) \r
+            )\r
+)\r
+\r
+del initial.txt\r
+del initial.available.txt\r
+\r
+dir /b configuration\initial>initial.txt\r
+dir /b configuration\initial.available>initial.available.txt\r
+\r
+SET fifi="^^(?^!org.opendaylight.(openflowplugin^|openflowjava)).*"\r
+IF "%OF13%" NEQ "0" (\r
+\r
+copy configuration\initial.available\42-openflowplugin.xml configuration\initial\\r
+SET fifi="^^(?^!org.opendaylight.controller.(thirdparty.org.openflow^|protocol_plugins.openflow)).*"\r
+)\r
+\r
+del initial.txt\r
+del initial.available.txt\r
+\r
+%CONTROLLER_RUNBAT% "-Dfelix.fileinstall.filter=!fifi!" %BUNDLEFILTER%\r