[OpenTK] Rollup OpenTK.Tizen 3.0.1

diff --git a/build.sh b/build.sh
index d51f6df..8a5a50a 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ DOTNET_CMD="$RETRY_CMD $TIMEOUT_CMD 600 dotnet"
 RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj /nologo"
 
 usage() {
-  echo "Usage: %0 [command] [args]"
+  echo "Usage: $0 [command] [args]"
   echo "Commands:"
   echo "    build [module]     Build a specific module"
   echo "    full               Build all modules in src/ directory"
@@ -22,6 +22,10 @@ usage() {
   echo "    clean              Clean all artifacts"
 }
 
+
+CI_VERSION_PREFIX=5.0.0
+CI_VERSION=$CI_VERSION_PREFIX.$((10000+$(git rev-list --count HEAD)))
+
 cmd_build() {
   if [ -z "$1" ]; then
     echo "No module specified."
@@ -64,8 +68,7 @@ cmd_ext_build() {
 cmd_pack() {
   VERSION=$1
   if [ -z "$VERSION" ]; then
-    TIMESTAMP=$(date +"%s")
-    VERSION="5.0.0-local-$TIMESTAMP"
+    VERSION=$CI_VERSION
   fi
 
   $RUN_BUILD /t:pack /p:Version=$VERSION

diff --git a/externals/opentk b/externals/opentk
index ae37d7b..08cb08f 160000 (submodule)
--- a/externals/opentk
+++ b/externals/opentk
@@ -1 +1 @@
-Subproject commit ae37d7bb0631f890c78505522caa5d49cf2d4b11
+Subproject commit 08cb08fd6cb879ec7bc1c31ad0e74c90b37ca9b0

diff --git a/externals/opentk.proj b/externals/opentk.proj
index 9b0f41d..e04a3b3 100644 (file)
--- a/externals/opentk.proj
+++ b/externals/opentk.proj
@@ -10,17 +10,33 @@
     <OpenTKProjectDirectory>$(MSBuildThisFileDirectory)opentk\src\OpenTK\</OpenTKProjectDirectory>
     <BindProjectDirectory>$(MSBuildThisFileDirectory)opentk\src\Generator.Bind\</BindProjectDirectory>
     <RewriteProjectDirectory>$(MSBuildThisFileDirectory)opentk\src\Generator.Rewrite\</RewriteProjectDirectory>
+
+    <OpenTKProject>$(OpenTKProjectDirectory)OpenTK.Tizen.csproj</OpenTKProject>
+    <BindProject>$(BindProjectDirectory)Generator.Bind.NETCore.csproj</BindProject>
+    <RewriteProject>$(RewriteProjectDirectory)Generator.Rewrite.NETCore.csproj</RewriteProject>
+
+    <OpenTKOutputDirectory>$(OpenTKProjectDirectory)bin\$(Configuration)\</OpenTKOutputDirectory>
+    <BindOutputDirectory>$(BindProjectDirectory)bin\$(Configuration)\</BindOutputDirectory>
+    <RewriteOutputDirectory>$(RewriteProjectDirectory)bin\$(Configuration)\</RewriteOutputDirectory>
 </PropertyGroup>
 
 <PropertyGroup>
-    <OpenTKProject>$(OpenTKProjectDirectory)OpenTK.Tizen.csproj</OpenTKProject>
-    <BindCmd>dotnet $(BindProjectDirectory)bin/$(Configuration)/netcoreapp2.0/Bind.dll</BindCmd>
+    <BindCmd>dotnet $(BindOutputDirectory)/netcoreapp2.0/Bind.dll</BindCmd>
 </PropertyGroup>
 
+<Target Name="CleanOpenTK">
+    <ItemGroup>
+        <DirToRemove Include="$(OpenTKOutputDirectory)" />
+        <DirToRemove Include="$(BindOutputDirectory)" />
+        <DirToRemove Include="$(RewriteOutputDirectory)" />
+    </ItemGroup>
+    <RemoveDir Directories="@(DirToRemove)" />
+</Target>
+
 <Target Name="BuildTools">
     <ItemGroup>
-        <ProjectsToBuild Include="$(BindProjectDirectory)Generator.Bind.NETCore.csproj" />
-        <ProjectsToBuild Include="$(RewriteProjectDirectory)Generator.Rewrite.NETCore.csproj" />
+        <ProjectsToBuild Include="$(BindProject)" />
+        <ProjectsToBuild Include="$(RewriteProject)" />
     </ItemGroup>
     <MSBuild Projects="@(ProjectsToBuild)" Targets="Restore"
              Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)" />
@@ -37,13 +53,10 @@
     <MSBuild Projects="$(OpenTKProject)" Targets="Build" Properties="Configuration=$(Configuration)" />
 
     <!-- Copy outputs to Artifacts -->
-    <PropertyGroup>
-        <OpenTKOutputDirectory>$(OpenTKProjectDirectory)bin\$(Configuration)\netstandard2.0\</OpenTKOutputDirectory>
-    </PropertyGroup>
     <ItemGroup>
-        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)OpenTK.dll" />
-        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)OpenTK.xml" />
-        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)OpenTK.pdb" />
+        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)netstandard2.0/OpenTK.dll" />
+        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)netstandard2.0/OpenTK.xml" />
+        <OpenTKOutputFiles Include="$(OpenTKOutputDirectory)netstandard2.0/OpenTK.pdb" />
     </ItemGroup>
     <Copy SourceFiles="@(OpenTKOutputFiles)" DestinationFolder="$(OutputExternalDir)" />
 </Target>
@@ -51,13 +64,13 @@
 <Target Name="PackOpenTK">
     <MSBuild Projects="$(OpenTKProject)" Targets="Pack" Properties="Configuration=$(Configuration);NoBuild=True" />
     <ItemGroup>
-        <OpenTKOutputPackFiles Include="$(OpenTKProjectDirectory)bin\$(Configuration)\OpenTK.Tizen.*.nupkg" />
+        <OpenTKOutputPackFiles Include="$(OpenTKOutputDirectory)OpenTK.Tizen.*.nupkg" />
     </ItemGroup>
     <Copy SourceFiles="@(OpenTKOutputPackFiles)" DestinationFolder="$(OutputBaseDir)" />
 </Target>
 
 <Target Name="Build"
-        DependsOnTargets="BuildTools;BuildOpenTK;PackOpenTK"
+        DependsOnTargets="CleanOpenTK;BuildTools;BuildOpenTK;PackOpenTK"
         Condition="Exists('$(OpenTKProjectDirectory)')">
 </Target>
 

diff --git a/packaging/externals.opentk.tar.gz b/packaging/externals.opentk.tar.gz
index 3f192b4..392eac3 100644 (file)
Binary files a/packaging/externals.opentk.tar.gz and b/packaging/externals.opentk.tar.gz differ