#616 Use single proxy for both windows8 and windows

phonegap · Apr 8, 2015 · eabae9e · eabae9e
1 parent aa80367
commit eabae9e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 3 deletions.
diff --git 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 → src/windows/BarcodeScannerProxy.js b/src/windows8/BarcodeScannerProxy.js → src/windows/BarcodeScannerProxy.js
diff --git a/src/windows8/lib/WinRTBarcodeReader.winmd → src/windows/lib/WinRTBarcodeReader.winmd b/src/windows8/lib/WinRTBarcodeReader.winmd → src/windows/lib/WinRTBarcodeReader.winmd
diff --git a/...WinRTBarcodeReader/WinRTBarcodeReader.sln → ...WinRTBarcodeReader/WinRTBarcodeReader.sln b/...WinRTBarcodeReader/WinRTBarcodeReader.sln → ...WinRTBarcodeReader/WinRTBarcodeReader.sln
diff --git a/...TBarcodeReader/Properties/AssemblyInfo.cs → ...TBarcodeReader/Properties/AssemblyInfo.cs b/...TBarcodeReader/Properties/AssemblyInfo.cs → ...TBarcodeReader/Properties/AssemblyInfo.cs
diff --git a/...arcodeReader/WinRTBarcodeReader/Reader.cs → ...arcodeReader/WinRTBarcodeReader/Reader.cs b/...arcodeReader/WinRTBarcodeReader/Reader.cs → ...arcodeReader/WinRTBarcodeReader/Reader.cs
diff --git a/...RTBarcodeReader/WinRTBarcodeReader.csproj → ...RTBarcodeReader/WinRTBarcodeReader.csproj b/...RTBarcodeReader/WinRTBarcodeReader.csproj → ...RTBarcodeReader/WinRTBarcodeReader.csproj
diff --git a/src/windows8/lib/ZXing.winmd → src/windows/lib/ZXing.winmd b/src/windows8/lib/ZXing.winmd → src/windows/lib/ZXing.winmd