Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Include winmd source as subproject instead of prebuilt winmd
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladimir Kotikov committed Apr 16, 2015
1 parent 96284b3 commit 21083d4
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 57 deletions.
26 changes: 10 additions & 16 deletions plugin.xml
Expand Up @@ -8,11 +8,11 @@
<license>MIT</license>

<repo>https://github.com/wildabeast/BarcodeScanner</repo>
<issue>https://github.com/wildabeast/BarcodeScanner/issues</issue>
<issue>https://github.com/wildabeast/BarcodeScanner/issues</issue>

<engines>
<engine name="cordova" version=">=3.0.0" />
</engines>
</engines>

<js-module src="www/barcodescanner.js" name="BarcodeScanner">
<clobbers target="cordova.plugins.barcodeScanner" />
Expand Down Expand Up @@ -52,7 +52,7 @@
<!--
<source-file src="R.java" target-dir="src/com/google/zxing/client/android" />
-->

<!--
<config-file target="res/xml/plugins.xml" parent="/plugins">
<plugin name="BarcodeScanner" value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
Expand Down Expand Up @@ -107,7 +107,7 @@
search: (src/android/LibraryProject/(.+?)/[^/]+)$
replace: <source-file src="$1" target-dir="$2"/>
-->

<source-file src="src/android/LibraryProject/res/drawable/launcher_icon.png" target-dir="res/drawable"/>
<source-file src="src/android/LibraryProject/res/drawable/share_via_barcode.png" target-dir="res/drawable"/>
<source-file src="src/android/LibraryProject/res/drawable/shopper_icon.png" target-dir="res/drawable"/>
Expand Down Expand Up @@ -294,30 +294,24 @@
<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/windows/lib/ZXing.winmd" custom="true" />
<framework src="src/windows/lib/WinRTBarcodeReader.winmd" custom="true" />

<framework src="src/windows/lib/WinRTBarcodeReader.csproj" custom="true" type="projectReference"/>
</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">
<config-file target="package.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" />
<framework src="src/windows/lib/WinRTBarcodeReader.csproj" custom="true" type="projectReference"/>
</platform>

<!-- Windows Phone 8 -->
Expand Down
File renamed without changes.
Expand Up @@ -14,6 +14,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectName>WinRTBarcodeReader</ProjectName>
<ProjectGuid>{01412F36-3781-4AF0-903C-ACEA7552C99C}</ProjectGuid>
<OutputType>winmdobj</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand Down Expand Up @@ -116,7 +117,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ZXing">
<HintPath>..\..\ZXing.winmd</HintPath>
<HintPath>ZXing.winmd</HintPath>
</Reference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
Expand All @@ -130,4 +131,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Binary file removed src/windows/lib/WinRTBarcodeReader.winmd
Binary file not shown.
39 changes: 0 additions & 39 deletions src/windows/lib/WinRTBarcodeReader/WinRTBarcodeReader.sln

This file was deleted.

0 comments on commit 21083d4

Please sign in to comment.