From: Wonyoung Choi <wy80.choi@samsung.com>
Date: Wed, 18 Sep 2019 01:34:48 +0000 (+0900)
Subject: [Build] Keep binary assembly file for Design assemblies
X-Git-Tag: 5.5_M2~74
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fcsapi%2Ftizenfx.git;a=commitdiff_plain;h=38d037fcb43052d3db4e1fc0d65f618b5ff6c57b

[Build] Keep binary assembly file for Design assemblies
---

diff --git a/build.sh b/build.sh
index b6d6979..e548a6a 100755
--- a/build.sh
+++ b/build.sh
@@ -20,32 +20,43 @@ usage() {
   echo "    clean              Clean all artifacts"
 }
 
+clean() {
+  $RUN_BUILD /t:clean
+  rm -f msbuild.log
+}
+
+build() {
+  if [ -d /nuget ]; then
+    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
+  fi
+  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $@
+  $RUN_BUILD /t:build /fl $@
+}
+
 cmd_build() {
   if [ -z "$1" ]; then
     echo "No module specified."
     exit 1
   fi
-  if [ -d /nuget ]; then
-    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
-  fi
   PROJECT=$1; shift
-  $RUN_BUILD /t:restore /p:Project=$PROJECT $NUGET_SOURCE_OPT $@
-  $RUN_BUILD /t:build /p:Project=$PROJECT $@
+  build /p:Project=$PROJECT
 }
 
 cmd_full_build() {
-  if [ -d /nuget ]; then
-    NUGET_SOURCE_OPT="/p:RestoreSources=/nuget"
+  clean
+  build $@
+  cmd_dummy_build $@
+}
+
+cmd_design_build() {
+  build /p:BuildDesignAssembly=True $@
+  if [ -d "$OUTDIR"/bin/design ]; then
+    cp -f "$OUTDIR"/bin/design/*.Design.dll "$SCRIPT_DIR"/pkg/Tizen.NET.API*/design/
   fi
-  rm -f msbuild.log
-  $RUN_BUILD /t:clean
-  $RUN_BUILD /t:restore $NUGET_SOURCE_OPT $@
-  $RUN_BUILD /t:build /fl $@
-  $RUN_BUILD /t:dummy
 }
 
 cmd_dummy_build() {
-  $RUN_BUILD /t:dummy
+  $RUN_BUILD /t:dummy $@
 }
 
 cmd_pack() {
@@ -105,6 +116,7 @@ case "$cmd" in
   build|--build|-b) cmd_build $@ ;;
   full |--full |-f) cmd_full_build $@ ;;
   dummy|--dummy|-d) cmd_dummy_build $@ ;;
+  design|--design)  cmd_design_build $@ ;;
   pack |--pack |-p) cmd_pack $@ ;;
   install |--install |-i) cmd_install $@ ;;
   clean|--clean|-c) cmd_clean $@ ;;
diff --git a/build/build.proj b/build/build.proj
index 6cddb78..e1a811d 100644
--- a/build/build.proj
+++ b/build/build.proj
@@ -11,15 +11,21 @@
 
   <!-- Projects to build -->
   <ItemGroup>
-    <ProjectToBuild Include="$(ProjectSrcDir)\$(Project)\$(Project).csproj"
-                    Condition="'$(Project)' != '' And Exists('$(ProjectSrcDir)\$(Project)\$(Project).csproj') " />
-    <ProjectToBuild Include="$(InternalProjectSrcDir)\$(Project)\$(Project).csproj"
-                    Condition="'$(Project)' != ''  And Exists('$(InternalProjectSrcDir)\$(Project)\$(Project).csproj')  " />
-    <ProjectToBuild Include="$(ProjectSrcDir)**\*.csproj" Condition="'$(Project)' == ''" />
-    <ProjectToBuild Include="$(InternalProjectSrcDir)**\*.csproj" Condition="'$(Project)' == '' " />
     <DesignProject Include="$(ProjectSrcDir)**\*.Design.csproj" />
     <DesignProject Include="$(InternalProjectSrcDir)**\*.Design.csproj" />
-    <ProjectToBuild Remove="@(DesignProject)" Condition="'$(BuildDesignAssembly)' != 'True' " />
+
+    <PublicProject Include="$(ProjectSrcDir)**\*.csproj" Condition="'$(Project)' == ''" />
+    <PublicProject Include="$(ProjectSrcDir)\$(Project)\$(Project).csproj"
+                   Condition="'$(Project)' != '' And Exists('$(ProjectSrcDir)\$(Project)\$(Project).csproj') " />
+    <PublicProject Remove="@(DesignProject)" />
+
+    <InternalProject Include="$(InternalProjectSrcDir)**\*.csproj" Condition="'$(Project)' == '' " />
+    <InternalProject Include="$(InternalProjectSrcDir)\$(Project)\$(Project).csproj"
+                     Condition="'$(Project)' != ''  And Exists('$(InternalProjectSrcDir)\$(Project)\$(Project).csproj')  " />
+    <InternalProject Remove="@(DesignProject)" />
+
+    <ProjectToBuild Include="@(DesignProject)" Condition="'$(BuildDesignAssembly)' == 'True' " />
+    <ProjectToBuild Include="@(PublicProject);@(InternalProject)" Condition="'$(BuildDesignAssembly)' != 'True' " />
   </ItemGroup>
 
   <!-- Nuspec files to pack -->
diff --git a/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec b/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
index 5f816f8..61cdbfb 100644
--- a/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
+++ b/pkg/Tizen.NET.API6/Tizen.NET.API6.nuspec
@@ -14,8 +14,8 @@
   </metadata>
   <files>
     <file src="pkg\Tizen.NET.API6\build\**" target="build" />
+    <file src="pkg\Tizen.NET.API6\design\*.dll" target="ref\netstandard2.0\Design" />
     <file src="Artifacts\bin\dummy\*.dll"  target="ref\netstandard2.0" />
     <file src="Artifacts\bin\public\*.xml"  target="ref\netstandard2.0" />
-    <file src="Artifacts\bin\design\*.Design.dll" target="ref\netstandard2.0\Design" />
   </files>
 </package>
diff --git a/pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll b/pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll
new file mode 100644
index 0000000..2c650fb
Binary files /dev/null and b/pkg/Tizen.NET.API6/design/Tizen.NUI.Design.dll differ