[OpenTK] Remove opentk external pkg (#507)

OpenTK.Tizen package will be provided from https://github.com/TizenAPI/opentk

diff --git a/build.sh b/build.sh
index 78119d8..f886049 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,6 @@ usage() {
   echo "Commands:"
   echo "    build [module]     Build a specific module"
   echo "    full               Build all modules in src/ directory"
-  echo "    ext                Build external modules in externals/ directory"
   echo "    dummy              Generate dummy assemblies of all modules"
   echo "    pack [version]     Make a NuGet package with build artifacts"
   echo "    clean              Clean all artifacts"
@@ -54,16 +53,6 @@ cmd_dummy_build() {
   $RUN_BUILD /t:dummy $NUGET_SOURCE_OPT
 }
 
-cmd_ext_build() {
-  if [ -d /nuget ]; then
-    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget;$SCRIPT_DIR/packages;$SCRIPT_DIR/Artifacts"
-  fi
-  PROJECTS=$(ls -1 $SCRIPT_DIR/externals/*.proj)
-  for p in $PROJECTS; do
-    $DOTNET_CMD msbuild $p /t:Build $NUGET_SOURCE_OPT /nologo
-  done
-}
-
 cmd_pack() {
   VERSION=$1
   if [ -z "$VERSION" ]; then
@@ -82,7 +71,6 @@ case "$cmd" in
   build|--build|-b) cmd_build $@ ;;
   full |--full |-f) cmd_full_build $@ ;;
   dummy|--dummy|-d) cmd_dummy_build $@ ;;
-  ext  |--ext  |-e) cmd_ext_build $@ ;;
   pack |--pack |-p) cmd_pack $@ ;;
   clean|--clean|-c) cmd_clean $@ ;;
   *) usage ;;

diff --git a/externals/opentk b/externals/opentk
deleted file mode 160000 (submodule)
index 273c2d4..0000000
--- a/externals/opentk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 273c2d4f8d5e2f8bf6facd51c8afdf58329fa69b

diff --git a/externals/opentk.proj b/externals/opentk.proj
deleted file mode 100644 (file)
index e04a3b3..0000000
--- a/externals/opentk.proj
+++ /dev/null
@@ -1,77 +0,0 @@
-<Project DefaultTargets="Build">
-
-<Import Project="$(MSBuildThisFileDirectory)..\build\directories.props" />
-
-<PropertyGroup>
-    <Configuration>Release</Configuration>
-</PropertyGroup>
-
-<PropertyGroup>
-    <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>
-    <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="$(BindProject)" />
-        <ProjectsToBuild Include="$(RewriteProject)" />
-    </ItemGroup>
-    <MSBuild Projects="@(ProjectsToBuild)" Targets="Restore"
-             Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)" />
-    <MSBuild Projects="@(ProjectsToBuild)" Targets="Build" Properties="Configuration=$(Configuration)" />
-</Target>
-
-<Target Name="BuildOpenTK">
-    <!-- Run Bind.exe -->
-    <Exec Command="$(BindCmd)" WorkingDirectory="$(MSBuildThisFileDirectory)opentk" />
-
-    <!-- Build OpenTK.dll -->
-    <MSBuild Projects="$(OpenTKProject)" Targets="Restore"
-             Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)" />
-    <MSBuild Projects="$(OpenTKProject)" Targets="Build" Properties="Configuration=$(Configuration)" />
-
-    <!-- Copy outputs to Artifacts -->
-    <ItemGroup>
-        <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>
-
-<Target Name="PackOpenTK">
-    <MSBuild Projects="$(OpenTKProject)" Targets="Pack" Properties="Configuration=$(Configuration);NoBuild=True" />
-    <ItemGroup>
-        <OpenTKOutputPackFiles Include="$(OpenTKOutputDirectory)OpenTK.Tizen.*.nupkg" />
-    </ItemGroup>
-    <Copy SourceFiles="@(OpenTKOutputPackFiles)" DestinationFolder="$(OutputBaseDir)" />
-</Target>
-
-<Target Name="Build"
-        DependsOnTargets="CleanOpenTK;BuildTools;BuildOpenTK;PackOpenTK"
-        Condition="Exists('$(OpenTKProjectDirectory)')">
-</Target>
-
-</Project>
\ No newline at end of file

diff --git a/packages/commandlineparser.2.2.0.nupkg b/packages/commandlineparser.2.2.0.nupkg
deleted file mode 100644 (file)
index 96b2511..0000000
Binary files a/packages/commandlineparser.2.2.0.nupkg and /dev/null differ

diff --git a/packages/mono.cecil.0.10.0.nupkg b/packages/mono.cecil.0.10.0.nupkg
deleted file mode 100644 (file)
index 10b5cc8..0000000
Binary files a/packages/mono.cecil.0.10.0.nupkg and /dev/null differ

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 3c344b3..a419f8a 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,7 +1,7 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 5
-%define TIZEN_NET_RPM_VERSION 5.0.0.999+nui503
+%define TIZEN_NET_RPM_VERSION 5.0.0.999+nui504
 %define TIZEN_NET_NUGET_VERSION 5.0.0.99999
 %define TIZEN_NET_INTERNAL_NUGET_VERSION 5.0.0.999
 
@@ -127,15 +127,6 @@ Tizen .NET assemblies for Wearable profile
 %setup -q
 cp %{SOURCE1} .
 
-# prepare external modules
-for ext in $(ls -1 packaging/externals.*.tar.gz); do
-  extname=$(basename -- $ext)
-  extname=${extname#externals\.}
-  extname=${extname%\.tar\.gz}
-  mkdir -p externals/$extname
-  tar xvfz $ext -C externals/$extname
-done
-
 %build
 %{?asan:export ASAN_OPTIONS=use_sigaltstack=false:allow_user_segv_handler=true:handle_sigfpe=false:`cat /ASAN_OPTIONS`}
 
@@ -158,7 +149,6 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 ./build.sh --full
 ./build.sh --dummy
 ./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION}
-./build.sh --ext
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}
@@ -169,8 +159,6 @@ mkdir -p %{buildroot}%{DOTNET_NUGET_SOURCE}
 # Install Runtime Assemblies
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Debug Symbols
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
index b6168d8..990f5e7 100644 (file)
--- a/packaging/csapi-tizenfx.spec.in
+++ b/packaging/csapi-tizenfx.spec.in
@@ -126,15 +126,6 @@ Tizen .NET assemblies for Wearable profile
 %setup -q
 cp %{SOURCE1} .
 
-# prepare external modules
-for ext in $(ls -1 packaging/externals.*.tar.gz); do
-  extname=$(basename -- $ext)
-  extname=${extname#externals\.}
-  extname=${extname%\.tar\.gz}
-  mkdir -p externals/$extname
-  tar xvfz $ext -C externals/$extname
-done
-
 %build
 %{?asan:export ASAN_OPTIONS=use_sigaltstack=false:allow_user_segv_handler=true:handle_sigfpe=false:`cat /ASAN_OPTIONS`}
 
@@ -157,7 +148,6 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 ./build.sh --full
 ./build.sh --dummy
 ./build.sh --pack %{TIZEN_NET_NUGET_VERSION} %{TIZEN_NET_INTERNAL_NUGET_VERSION}
-./build.sh --ext
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}
@@ -168,8 +158,6 @@ mkdir -p %{buildroot}%{DOTNET_NUGET_SOURCE}
 # Install Runtime Assemblies
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 install -p -m 644 %{_tizenfx_bin_path}/bin/internal/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
-[ -d %{_tizenfx_bin_path}/bin/external ] \
-  && install -p -m 644 %{_tizenfx_bin_path}/bin/external/*.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 
 # Install Debug Symbols
 install -p -m 644 %{_tizenfx_bin_path}/bin/public/*.pdb %{buildroot}%{DOTNET_ASSEMBLY_PATH}

diff --git a/packaging/externals.opentk.tar.gz b/packaging/externals.opentk.tar.gz
deleted file mode 100644 (file)
index 7d848b5..0000000
Binary files a/packaging/externals.opentk.tar.gz and /dev/null differ

diff --git a/packaging/make-externals-tarballs.sh b/packaging/make-externals-tarballs.sh
deleted file mode 100755 (executable)
index bd5ad3f..0000000
--- a/packaging/make-externals-tarballs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-SCRIPT_FILE=$(readlink -f $0)
-export SCRIPT_DIR=$(dirname $SCRIPT_FILE)
-
-git submodule init
-git submodule update
-git submodule foreach 'git archive --format=tar.gz HEAD -o $SCRIPT_DIR/externals.$name.tar.gz'

diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt
index d63885f..104e466 100755 (executable)
--- a/pkg/PlatformFileList.txt
+++ b/pkg/PlatformFileList.txt
@@ -1,6 +1,5 @@
 ElmSharp.dll                                       #common #mobile #mobile-emul #tv #ivi #wearable
 ElmSharp.Wearable.dll                              #wearable
-OpenTK.dll                                         #mobile #mobile-emul #tv #wearable
 res/maps_marker_pin_48.png                         #mobile #mobile-emul #tv #wearable
 res/maps_marker_pin_72.png                         #mobile #mobile-emul #tv #wearable
 res/maps_marker_sticker_48.png                     #mobile #mobile-emul #tv #wearable