From eabae9e10be2e21f8c5f917748bd769c9fe11b43 Mon Sep 17 00:00:00 2001
From: Vladimir Kotikov <v-vlkoti@microsoft.com>
Date: Wed, 24 Sep 2014 18:35:47 +0400
Subject: [PATCH] #616 Use single proxy for both windows8 and windows

---
 plugin.xml                                    |  25 +++++++++++++++---
 .../BarcodeScannerProxy.js                    |   0
 .../lib/WinRTBarcodeReader.winmd              | Bin
 .../WinRTBarcodeReader/WinRTBarcodeReader.sln |   0
 .../Properties/AssemblyInfo.cs                |   0
 .../WinRTBarcodeReader/Reader.cs              |   0
 .../WinRTBarcodeReader.csproj                 |   0
 src/{windows8 => windows}/lib/ZXing.winmd     | Bin
 8 files changed, 22 insertions(+), 3 deletions(-)
 rename src/{windows8 => windows}/BarcodeScannerProxy.js (100%)
 rename src/{windows8 => windows}/lib/WinRTBarcodeReader.winmd (100%)
 rename src/{windows8 => windows}/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln (100%)
 rename src/{windows8 => windows}/lib/WinRTBarcodeReader/WinRTBarcodeReader/Properties/AssemblyInfo.cs (100%)
 rename src/{windows8 => windows}/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs (100%)
 rename src/{windows8 => windows}/lib/WinRTBarcodeReader/WinRTBarcodeReader/WinRTBarcodeReader.csproj (100%)
 rename src/{windows8 => windows}/lib/ZXing.winmd (100%)

diff --git a/plugin.xml b/plugin.xml
index f0b4047e..97d076e8 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -291,14 +291,33 @@
     </platform>
 
     <platform name="windows8">
-        <js-module src="src/windows8/BarcodeScannerProxy.js" name="BarcodeScannerProxy">
+        <js-module src="src/windows/BarcodeScannerProxy.js" name="BarcodeScannerProxy">
             <merges target="" />
         </js-module>
         <config-file target="package.appxmanifest" parent="/Package/Capabilities">
             <DeviceCapability Name="webcam" />
         </config-file>
-        <framework src="src/windows8/lib/ZXing.winmd" custom="true" />
-        <framework src="src/windows8/lib/WinRTBarcodeReader.winmd" custom="true" />
+        <framework src="src/windows/lib/ZXing.winmd" custom="true" />
+        <framework src="src/windows/lib/WinRTBarcodeReader.winmd" custom="true" />
+    </platform>
+
+    <platform name="windows">
+        <js-module src="src/windows/BarcodeScannerProxy.js" name="BarcodeScannerProxy">
+            <merges target="" />
+        </js-module>
+
+        <config-file target="package.windows.appxmanifest" parent="/Package/Capabilities">
+            <DeviceCapability Name="webcam" />
+        </config-file>
+        <config-file target="package.windows80.appxmanifest" parent="/Package/Capabilities">
+            <DeviceCapability Name="webcam" />
+        </config-file>
+        <config-file target="package.phone.appxmanifest" parent="/Package/Capabilities">
+            <DeviceCapability Name="webcam" />
+        </config-file>
+
+        <framework src="src/windows/lib/ZXing.winmd" custom="true" />
+        <framework src="src/windows/lib/WinRTBarcodeReader.winmd" custom="true" />
     </platform>
 
     <!-- Windows Phone 8 -->
diff --git a/src/windows8/BarcodeScannerProxy.js b/src/windows/BarcodeScannerProxy.js
similarity index 100%
rename from src/windows8/BarcodeScannerProxy.js
rename to src/windows/BarcodeScannerProxy.js
diff --git a/src/windows8/lib/WinRTBarcodeReader.winmd b/src/windows/lib/WinRTBarcodeReader.winmd
similarity index 100%
rename from src/windows8/lib/WinRTBarcodeReader.winmd
rename to src/windows/lib/WinRTBarcodeReader.winmd
diff --git a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln b/src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln
similarity index 100%
rename from src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln
rename to src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln
diff --git a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Properties/AssemblyInfo.cs b/src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Properties/AssemblyInfo.cs
rename to src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/Properties/AssemblyInfo.cs
diff --git a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs b/src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs
similarity index 100%
rename from src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs
rename to src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs
diff --git a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/WinRTBarcodeReader.csproj b/src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/WinRTBarcodeReader.csproj
similarity index 100%
rename from src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/WinRTBarcodeReader.csproj
rename to src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader/WinRTBarcodeReader.csproj
diff --git a/src/windows8/lib/ZXing.winmd b/src/windows/lib/ZXing.winmd
similarity index 100%
rename from src/windows8/lib/ZXing.winmd
rename to src/windows/lib/ZXing.winmd