Skip to content

Commit 6595952

Browse files
committed
zou-build: update goblin agent to support 'cresus-cross'.
1 parent eaf6417 commit 6595952

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Goblin.Agent.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,13 @@ Input:
6464
</PropertyGroup>
6565

6666
<PropertyGroup>
67-
<GoblinBundleDir Condition="'$(GoblinBundleDir)' == ''">$([System.IO.Path]::GetFullPath('$(BundleDir)..\westeros-dev\'))</GoblinBundleDir>
67+
<GoblinBundleDir Condition="'$(GoblinBundleDir)' == ''">$([System.IO.Path]::GetFullPath('$(BundleDir)..\cresus-cross-dev\cresus-cross\'))</GoblinBundleDir>
6868
<GoblinSourceDir Condition="'$(GoblinSourceDir)' == ''">$(GoblinBundleDir)lib\$(GoblinName)\</GoblinSourceDir>
6969
<GoblinBuildId Condition="'$(GoblinBuildId)' == ''">$(MSBuildProjectName)</GoblinBuildId>
7070
<GoblinIntDir Condition="'$(GoblinIntDir)' == ''">$(ModuleDir)obj\$(Configuration)\$(ProjectName)\</GoblinIntDir>
7171
<GoblinOutDir Condition="'$(GoblinOutDir)' == ''">$(GoblinIntDir)build\product\win-unpacked\</GoblinOutDir>
7272
<GoblinTargetPath Condition="'$(GoblinTargetPath)' == ''">$(GoblinOutDir)$(TargetName)$(ZouExeExtension)</GoblinTargetPath>
73+
<ZogPath Condition="'$(ZogPath)' == ''">$(GoblinBundleDir)node_modules\.bin\zog</ZogPath>
7374
</PropertyGroup>
7475

7576
<Target Name="CheckGoblinBundleDir">
@@ -88,6 +89,7 @@ Input:
8889
<Message Importance="high" Text="GoblinIntDir = $(GoblinIntDir)" />
8990
<Message Importance="high" Text="GoblinOutDir = $(GoblinOutDir)" />
9091
<Message Importance="high" Text="GoblinTargetPath = $(GoblinTargetPath)" />
92+
<Message Importance="high" Text="ZogPath = $(ZogPath)" />
9193
<Message Importance="high" Text="#GoblinBuildInput = @(GoblinBuildInput->Count())" />
9294
<Message Importance="high" Text=" " />
9395
</Target>

Goblin.Agent.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Input:
5050

5151
<Message Importance="high" Text='$(L1b)[$(Configuration)|$(Platform)] $(XC)zog electronify.build $(T1)$(GoblinBuildId)$(XC) "$(GoblinIntDir)." $(Platform)' />
5252
<CallTarget Targets="GoblinEnsureBuilderRunning" />
53-
<Exec Command='zog electronify.build $(GoblinBuildId) "$(GoblinIntDir)." $(Platform)' WorkingDirectory="$(GoblinBundleDir)" EnvironmentVariables="GOBLINS_APP=builder" />
53+
<Exec Command='"$(ZogPath)" electronify.build $(GoblinBuildId) "$(GoblinIntDir)." $(Platform)' WorkingDirectory="$(GoblinBundleDir)" EnvironmentVariables="GOBLINS_APP=builder" />
5454
</Target>
5555

5656
<Target Name="GoblinInitPostBuildCopy">

0 commit comments

Comments
 (0)