Skip to content
This repository has been archived by the owner on Nov 28, 2018. It is now read-only.

Commit

Permalink
fixed build script
Browse files Browse the repository at this point in the history
  • Loading branch information
pollend committed May 12, 2016
1 parent ee69908 commit 16b16f3
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions AppImage/Packager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ mkdir -p ./$APP/$APP.AppDir/usr/bin
mkdir -p ./$APP/$APP.AppDir/usr/opt

#build Nexus Client and copy release into bin
xbuild /p:Configuration=Release ./../src/ParkitectNexus.Client.Linux.Xwt/ParkitectNexus.Client.Linux.Xwt.csproj
cp -R ./../src/ParkitectNexus.Client.Linux.Xwt/bin/Release/* ./$APP/$APP.AppDir/usr/bin
xbuild /p:Configuration=Release ./../src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj
cp -R ./../bin/Release/* ./$APP/$APP.AppDir/usr/bin

# Figure out $VERSION
VERSION=$(git describe origin/master --tags $(git rev-list --tags --max-count=0))
Expand Down
2 changes: 1 addition & 1 deletion AppImage/parkitectnexus
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export MONO_CONFIG=././etc/mono/config
export MONO_CFG_DIR=././etc

././bin/mozroots --import --sync
././bin/mono "././bin/ParkitectNexus.Client.Linux.Xwt.exe" "$@"
././bin/mono "././bin/ParkitectNexus.Client.Linux.exe" "$@"



4 changes: 0 additions & 4 deletions images/.directory

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="parkitectnexus_logo.png" />
<Content Include="parkitectnexus_logo.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
23 changes: 10 additions & 13 deletions src/ParkitectNexus.Data/ParkitectNexus.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ParkitectNexus.AssetMagic, Version=2.0.5969.20896, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ParkitectNexus.AssetMagic.2.0.5969.20896\lib\net45\ParkitectNexus.AssetMagic.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StructureMap, Version=4.2.0.402, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\structuremap.4.2.0.402\lib\net40\StructureMap.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StructureMap.Net4, Version=4.2.0.402, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\structuremap.4.2.0.402\lib\net40\StructureMap.Net4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
Expand All @@ -104,6 +92,15 @@
<Reference Include="Octokit, Version=0.19.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\Octokit.0.19.0\lib\net45\Octokit.dll</HintPath>
</Reference>
<Reference Include="ParkitectNexus.AssetMagic, Version=2.0.5969.20896, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\ParkitectNexus.AssetMagic.2.0.5969.20896\lib\net45\ParkitectNexus.AssetMagic.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=4.2.0.402, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\structuremap.4.2.0.402\lib\net40\StructureMap.dll</HintPath>
</Reference>
<Reference Include="StructureMap.Net4, Version=4.2.0.402, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\structuremap.4.2.0.402\lib\net40\StructureMap.Net4.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\AssetEventArgs.cs" />
Expand Down Expand Up @@ -169,8 +166,8 @@
<Compile Include="Tasks\TaskStatus.cs" />
<Compile Include="Tasks\Prefab\TestWaitQueueableTask.cs" />
<Compile Include="Updating\IUpdateManager.cs" />
<Compile Include="Updating\UpdateManager.cs"></Compile>
<Compile Include="Updating\UpdateInfo.cs" />
<Compile Include="Updating\UpdateManager.cs" />
<Compile Include="Utilities\ILogger.cs" />
<Compile Include="Utilities\ImageUtility.cs" />
<Compile Include="ObjectFactory.cs" />
Expand Down
14 changes: 11 additions & 3 deletions src/ParkitectNexus.Data/Updating/UpdateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,17 @@ public UpdateInfo CheckForUpdates<TEntryPoint>()
}
catch(Exception e)
{
_log.WriteLine(GetUpdateVersionUrl());
_log.WriteLine("Failed to check for updates");
_log.WriteException(e);
//TODO: hotfix to avoid the application from crashing
try{
_log.WriteLine(GetUpdateVersionUrl());
_log.WriteLine("Failed to check for updates");
_log.WriteException(e);
}
catch(Exception ex)
{
_log.WriteException(ex);

}
}

return null;
Expand Down

0 comments on commit 16b16f3

Please sign in to comment.