Merge pull request #33 from Devolutions/improve-nuget-build-script

improve nuget build script
Devolutions · Oct 7, 2019 · 6aeffec · 6aeffec
2 parents 27e8662 + 904de2d
commit 6aeffec
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/wrappers/csharp/nuget/GenerateNuget.py b/wrappers/csharp/nuget/GenerateNuget.py
@@ -21,15 +21,15 @@
 if sys.argv[1] == "WIN" or everything:
     print("Generating WINDOWS nuget...")
 
-    command= subprocess.Popen(["nuget", "pack", "./Windows/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./Windows/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE)
+    command= subprocess.Popen(["nuget", "pack", "./Windows/Devolutions.Crypto.Windows.nuspec", "-Version", version, "-OutputDirectory", "./Windows/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)
 
 if sys.argv[1] == "LINUX" or everything:
     print("Generating LINUX nuget...")
 
-    command= subprocess.Popen(["nuget", "pack", "./Linux/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./Linux/package", "-Properties", "platform=linux"], stdout=subprocess.PIPE)
+    command= subprocess.Popen(["nuget", "pack", "./Linux/Devolutions.Crypto.Linux.nuspec", "-Version", version, "-OutputDirectory", "./Linux/package", "-Properties", "platform=linux"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)
@@ -67,7 +67,8 @@
 if sys.argv[1] == "MAC-FULL" or everything:
     print("Generating MAC FULL nuget...")
 
-    command= subprocess.Popen(["nuget", "pack", "./macOS/Full/Devolutions.Crypto.nuspec", "-Version", version, "-OutputDirectory", "./macOS/Full/package", "-Properties", "platform=macos"], stdout=subprocess.PIPE)
+    # platform windows (since the managed mac dll only supports xamarin modern, windows managed dll is compatible)
+    command= subprocess.Popen(["nuget", "pack", "./macOS/Full/Devolutions.Crypto.Mac.Full.nuspec", "-Version", version, "-OutputDirectory", "./macOS/Full/package", "-Properties", "platform=windows"], stdout=subprocess.PIPE)
     output = command.stdout.read().decode('utf-8')
 
     print(output)

diff --git a/...arp/nuget/Linux/Devolutions.Crypto.nuspec → ...get/Linux/Devolutions.Crypto.Linux.nuspec b/...arp/nuget/Linux/Devolutions.Crypto.nuspec → ...get/Linux/Devolutions.Crypto.Linux.nuspec
@@ -26,6 +26,6 @@
     <file src="../../linux/bin/libDevolutionsCrypto-x64.so" target="runtimes/linux-x64/native/libDevolutionsCrypto-x64.so"/>
     <file src="../../linux/bin/libDevolutionsCrypto-x86.so" target="runtimes/linux-x86/native/libDevolutionsCrypto-x86.so"/>
 
-    <file src="Devolutions.Crypto.targets" target="build/net45/Devolutions.Crypto.targets"/>
+    <file src="Devolutions.Crypto.Linux.targets" target="build/net45/Devolutions.Crypto.Linux.targets"/>
 </files>
 </package>
diff --git a/...rp/nuget/Linux/Devolutions.Crypto.targets → ...et/Linux/Devolutions.Crypto.Linux.targets b/...rp/nuget/Linux/Devolutions.Crypto.targets → ...et/Linux/Devolutions.Crypto.Linux.targets
diff --git a/...p/nuget/Windows/Devolutions.Crypto.nuspec → ...Windows/Devolutions.Crypto.Windows.nuspec b/...p/nuget/Windows/Devolutions.Crypto.nuspec → ...Windows/Devolutions.Crypto.Windows.nuspec
@@ -26,6 +26,6 @@
     <file src="../../windows/bin/DevolutionsCrypto-x64.dll" target="runtimes/win-x64/native/DevolutionsCrypto-x64.dll"/>
     <file src="../../windows/bin/DevolutionsCrypto-x86.dll" target="runtimes/win-x86/native/DevolutionsCrypto-x86.dll"/>
 
-    <file src="Devolutions.Crypto.targets" target="build/net45/Devolutions.Crypto.targets"/>
+    <file src="Devolutions.Crypto.Windows.targets" target="build/net45/Devolutions.Crypto.Windows.targets"/>
 </files>
 </package>
diff --git a/.../nuget/Windows/Devolutions.Crypto.targets → ...indows/Devolutions.Crypto.Windows.targets b/.../nuget/Windows/Devolutions.Crypto.targets → ...indows/Devolutions.Crypto.Windows.targets
diff --git a/...uget/macOS/Full/Devolutions.Crypto.nuspec → ...S/Full/Devolutions.Crypto.Mac.Full.nuspec b/...uget/macOS/Full/Devolutions.Crypto.nuspec → ...S/Full/Devolutions.Crypto.Mac.Full.nuspec
@@ -25,6 +25,6 @@
 
     <file src="../../../macos/bin/x86_64/libDevolutionsCrypto.dylib" target="runtimes/osx-x64/native/libDevolutionsCrypto-x64.dylib"/>
 
-    <file src="Devolutions.Crypto.targets" target="build/net45/Devolutions.Crypto.targets"/>
+    <file src="Devolutions.Crypto.Mac.Full.targets" target="build/net45/Devolutions.Crypto.Mac.Full.targets"/>
 </files>
 </package>
diff --git a/...get/macOS/Full/Devolutions.Crypto.targets → .../Full/Devolutions.Crypto.Mac.Full.targets b/...get/macOS/Full/Devolutions.Crypto.targets → .../Full/Devolutions.Crypto.Mac.Full.targets