Skip to content

Commit

Permalink
Added compilation for ZiosThemesEditor as editor-only managed plugin
Browse files Browse the repository at this point in the history
-- ZiosTheme project file has been split into two, one
UnityEngine/Standalone specific; the other UnityEditor type
-- ZiosTheme solution now compiles the projects into two managed .dll's
-- Adjustments have been done for the Hook support and Themes editor
interface file from preventing building the standalone build
-- Compilation scripts/batch files are updated to handle the operation
of multiple .dll compilation and cleanup properly
  • Loading branch information
zios committed Jun 20, 2016
1 parent ed0ec03 commit c091f48
Show file tree
Hide file tree
Showing 21 changed files with 116 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/@Solutions/ZiosThemes.dll
/@Solutions~/ZiosThemesEditor.dll
/@Solutions~/ZiosThemes.dll
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@ECHO OFF
copy /Y 3.5.7\* . >NUL
del ZiosThemes.dll
del ZiosThemes*.dll
IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32
IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64
IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@ECHO OFF
copy /Y 4.7.2\* . >NUL
del ZiosThemes.dll
del ZiosThemes*.dll
IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32
IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64
IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@ECHO OFF
copy /Y 5.4\* . >NUL
echo Compiling ZiosThemes.dll - Mono Framework 4.5 / Unity 5.x...
del ZiosThemes.dll
del ZiosThemes*.dll
call "%programfiles%\Unity\Editor\Data\MonoBleedingEdge\bin\xbuild.bat" ZiosThemes.sln
rmdir /Q /S obj
copy /Y 5.4\* . >NUL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@ECHO OFF
copy /Y 5.4\* . >NUL
del ZiosThemes.dll
del ZiosThemes*.dll
IF EXIST "%programfiles%\MSBuild\14.0\Bin" GOTO USE_VS14_X32
IF EXIST "%programfiles(x86)%\MSBuild\14.0\Bin" GOTO USE_VS14_X64
IF EXIST "%programfiles%\MSBuild\15.0\Bin" GOTO USE_VS15_X32
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/sh

rm ZiosThemes.dll
/Applications/Unity/Unity.app/Contents/MonoBleedingEdge/bin/xbuild ZiosThemesMono.sln
rm ZiosThemes*.dll
/Applications/Unity/Unity.app/Contents/MonoBleedingEdge/bin/xbuild ZiosThemes.sln
rm -R obj
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 1 addition & 13 deletions @Solutions/ZiosThemes.csproj → @Solutions~/ZiosThemes.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@
<OutputPath>.</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_STANDALONE;UNITY_THEMES</DefineConstants>
<DefineConstants>UNITY_STANDALONE;UNITY_THEMES</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="UnityEditor">
<HintPath>UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>UnityEngine.dll</HintPath>
</Reference>
Expand All @@ -34,9 +31,6 @@
<Compile Include="..\Containers\Container.cs" />
<Compile Include="..\Extensions\%40Unity\Color.cs" />
<Compile Include="..\Extensions\%40Unity\ComponentExtensions.cs" />
<Compile Include="..\Extensions\%40Unity\EditorGUI.cs" />
<Compile Include="..\Extensions\%40Unity\EditorGUILayout.cs" />
<Compile Include="..\Extensions\%40Unity\Editor\GenericMenu.cs" />
<Compile Include="..\Extensions\%40Unity\GameObject.cs" />
<Compile Include="..\Extensions\%40Unity\GUIContent.cs" />
<Compile Include="..\Extensions\%40Unity\GUISkin.cs" />
Expand Down Expand Up @@ -75,7 +69,6 @@
<Compile Include="..\Supports\Locate.cs" />
<Compile Include="..\Supports\Store.cs" />
<Compile Include="..\Supports\Utility\Utility.cs" />
<Compile Include="..\Supports\Utility\UtilityEditor.cs" />
<Compile Include="..\Supports\Utility\UtilityProxy.cs" />
<Compile Include="..\System Attributes\EnumMask.cs" />
<Compile Include="..\System Attributes\Internal.cs" />
Expand All @@ -87,11 +80,6 @@
<Compile Include="..\Systems\File\FileManager.cs" />
<Compile Include="..\Systems\Interface\Style\Style.cs" />
<Compile Include="..\Systems\Interface\Style\StyleCSS.cs" />
<Compile Include="..\Systems\Interface\Themes\Editor\ThemeVerticalSpace.cs" />
<Compile Include="..\Systems\Interface\Themes\Themes.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesLoading.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesSaving.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesUtility.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
8 changes: 7 additions & 1 deletion @Solutions/ZiosThemes.sln → @Solutions~/ZiosThemes.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZiosThemes", "ZiosThemes.csproj", "{90C40447-C2B4-4725-9CEA-9E0E8199EEFC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZiosThemesEditor", "ZiosThemesEditor.csproj", "{181349BA-06EE-47B5-928A-AA3413A8C2DA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{90C40447-C2B4-4725-9CEA-9E0E8199EEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90C40447-C2B4-4725-9CEA-9E0E8199EEFC}.Release|Any CPU.Build.0 = Release|Any CPU
{181349BA-06EE-47B5-928A-AA3413A8C2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{181349BA-06EE-47B5-928A-AA3413A8C2DA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
97 changes: 97 additions & 0 deletions @Solutions~/ZiosThemesEditor.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{181349BA-06EE-47B5-928A-AA3413A8C2DA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ZiosThemesEditor</RootNamespace>
<AssemblyName>ZiosThemesEditor</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>.</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_THEMES</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="UnityEditor">
<HintPath>UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Containers\Container.cs" />
<Compile Include="..\Extensions\%40Unity\Color.cs" />
<Compile Include="..\Extensions\%40Unity\ComponentExtensions.cs" />
<Compile Include="..\Extensions\%40Unity\EditorGUI.cs" />
<Compile Include="..\Extensions\%40Unity\EditorGUILayout.cs" />
<Compile Include="..\Extensions\%40Unity\Editor\GenericMenu.cs" />
<Compile Include="..\Extensions\%40Unity\GameObject.cs" />
<Compile Include="..\Extensions\%40Unity\GUIContent.cs" />
<Compile Include="..\Extensions\%40Unity\GUISkin.cs" />
<Compile Include="..\Extensions\%40Unity\GUIStyle.cs" />
<Compile Include="..\Extensions\%40Unity\Rect.cs" />
<Compile Include="..\Extensions\%40Unity\RectOffset.cs" />
<Compile Include="..\Extensions\%40Unity\Texture.cs" />
<Compile Include="..\Extensions\%40Unity\UnityObjectExtensions.cs" />
<Compile Include="..\Extensions\%40Unity\Vector3.cs" />
<Compile Include="..\Extensions\Array.cs" />
<Compile Include="..\Extensions\BitArray.cs" />
<Compile Include="..\Extensions\BitStream.cs" />
<Compile Include="..\Extensions\Bool.cs" />
<Compile Include="..\Extensions\Byte.cs" />
<Compile Include="..\Extensions\ByteArray.cs" />
<Compile Include="..\Extensions\DateTime.cs" />
<Compile Include="..\Extensions\Decimal.cs" />
<Compile Include="..\Extensions\Delegate.cs" />
<Compile Include="..\Extensions\Dictionary.cs" />
<Compile Include="..\Extensions\Double.cs" />
<Compile Include="..\Extensions\Enum.cs" />
<Compile Include="..\Extensions\Float.cs" />
<Compile Include="..\Extensions\IEnumerable.cs" />
<Compile Include="..\Extensions\Int.cs" />
<Compile Include="..\Extensions\List.cs" />
<Compile Include="..\Extensions\Object\Object.cs" />
<Compile Include="..\Extensions\Object\ObjectReflection.cs" />
<Compile Include="..\Extensions\Serializable.cs" />
<Compile Include="..\Extensions\Short.cs" />
<Compile Include="..\Extensions\StringBuilder.cs" />
<Compile Include="..\Extensions\String\String.cs" />
<Compile Include="..\Extensions\Type.cs" />
<Compile Include="..\Supports\Button.cs" />
<Compile Include="..\Supports\Colors.cs" />
<Compile Include="..\Supports\Hook.cs" />
<Compile Include="..\Supports\Locate.cs" />
<Compile Include="..\Supports\Store.cs" />
<Compile Include="..\Supports\Utility\Utility.cs" />
<Compile Include="..\Supports\Utility\UtilityEditor.cs" />
<Compile Include="..\Supports\Utility\UtilityProxy.cs" />
<Compile Include="..\System Attributes\EnumMask.cs" />
<Compile Include="..\System Attributes\Internal.cs" />
<Compile Include="..\System Attributes\Unity\InitializeOnLoad.cs" />
<Compile Include="..\Systems\Event\Event.cs" />
<Compile Include="..\Systems\Event\EventDetector.cs" />
<Compile Include="..\Systems\Event\EventListener.cs" />
<Compile Include="..\Systems\Event\EventStepper.cs" />
<Compile Include="..\Systems\File\FileManager.cs" />
<Compile Include="..\Systems\Interface\Style\Style.cs" />
<Compile Include="..\Systems\Interface\Style\StyleCSS.cs" />
<Compile Include="..\Systems\Interface\Themes\Editor\ThemeVerticalSpace.cs" />
<Compile Include="..\Systems\Interface\Themes\Themes.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesLoading.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesSaving.cs" />
<Compile Include="..\Systems\Interface\Themes\ThemesUtility.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
2 changes: 2 additions & 0 deletions Supports/Hook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ namespace Zios{
public static class Hook{
public static bool disabled;
public static bool hidden;
#if UNITY_EDITOR
static Hook(){
Hook.hidden = EditorPrefs.GetBool("EditorSettings-HideHooks",false);
}
#endif
public static void SetHidden(bool state){
Locate.SetDirty();
foreach(var current in Locate.GetSceneObjects()){
Expand Down
2 changes: 1 addition & 1 deletion Systems/Interface/Themes/Themes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Collections.Generic;
using UnityEngine;
namespace Zios{
using Interface;
#if UNITY_EDITOR
using UnityEditor;
using Interface;
#if UNITY_EDITOR_WIN
using Microsoft.Win32;
#endif
Expand Down

0 comments on commit c091f48

Please sign in to comment.