Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #226 fix - made inklecate and tests project depend on ink-runtime-engine #227

Merged
merged 10 commits into from
Dec 20, 2016
Merged

Issue #226 fix - made inklecate and tests project depend on ink-runtime-engine #227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bfec5f8
Changed inkle to depen on ink-engine-runtime, discarded shared projec…
Nov 15, 2016
1a0c274
renamed assembly name for ink-engine-runtime to reflect the actual dl…
Nov 16, 2016
ad49538
Renamed assembly name for the tests project to ink-tests to avoid dis…
Nov 16, 2016
b72594f
removed ink-engine-dll project, as it is now substituted by ink-engin…
Nov 16, 2016
6cfa4de
reverted renaming of tests project due to failing CI build
Nov 16, 2016
b30970a
- Fixed travis config to use ink-tests.dll instad of tests.dll, so th…
Nov 16, 2016
f6c0021
fixed solution error that breaks xbuild
Nov 16, 2016
c315fff
fixes to solution
Nov 29, 2016
3a25b8c
added ink-engine-runtime.dll explicityly to the mkdbundle command, as…
Dec 6, 2016
d545ba3
Merge branch 'master' of https://github.com/inkle/ink into x
stackh34p Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ before_script:
- nuget restore ink.sln
script:
- xbuild ink.sln
- nunit-console tests/bin/Debug/tests.dll
- nunit-console tests/bin/Debug/ink-tests.dll
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not have missed that, but on Linux this file was initially hidden

4 changes: 2 additions & 2 deletions build_release.command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mkdir -p ReleaseBinary

# Windows: Simply zip up inklecate.exe and the runtime together
# We rely on a compatible version of .NET being installed on Windows
zip --junk-paths ReleaseBinary/inklecate_windows_and_linux.zip inklecate/bin/Release/inklecate.exe ink-engine-dll/bin/Release/ink-engine.dll ink-engine-dll/bin/Release/ink-engine.xml
zip --junk-paths ReleaseBinary/inklecate_windows_and_linux.zip inklecate/bin/Release/inklecate.exe ink-engine-runtime/bin/Release/ink-engine-runtime.dll ink-engine-runtime/bin/Release/ink-engine-runtime.xml

# Mac: Make a native binary that includes the mono runtime
# Prepare to bundle up compiled binary
Expand All @@ -22,6 +22,6 @@ export CC="cc -arch i386 -framework CoreFoundation -lobjc -liconv"
# "Bundles in addition support a –static flag. The –static flag causes mkbundle to generate a static executable that statically links the Mono runtime. Be advised that this option will trigger the LGPL requirement that you still distribute the independent pieces to your user so he can manually upgrade his Mono runtime if he chooses to do so. Alternatively, you can obtain a proprietary license of Mono by contacting Xamarin."
# http://www.mono-project.com/archived/guiderunning_mono_applications/
mkbundle ./inklecate/bin/Release/inklecate.exe --deps --static -o ./ReleaseBinary/inklecate
zip --junk-paths ReleaseBinary/inklecate_mac.zip ReleaseBinary/inklecate ink-engine-dll/bin/Release/ink-engine.dll
zip --junk-paths ReleaseBinary/inklecate_mac.zip ReleaseBinary/inklecate ink-engine-runtime/bin/Release/ink-engine-runtime.dll

rm ReleaseBinary/inklecate
2 changes: 1 addition & 1 deletion ink-engine-runtime/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// Required to allow access of inernal types to 'inklecate' and the 'tests' project
[assembly: InternalsVisibleTo ("inklecate")]
[assembly: InternalsVisibleTo ("tests")]
[assembly: InternalsVisibleTo ("ink-tests")]

// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
Expand Down
2 changes: 1 addition & 1 deletion inklecate/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: InternalsVisibleTo("tests")]
[assembly: InternalsVisibleTo("ink-tests")]

[assembly: AssemblyVersion ("1.0.*")]

Expand Down
2 changes: 1 addition & 1 deletion tests/tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProjectGuid>{C48016BB-CF8B-4357-B052-E4DC63AED06B}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>tests</RootNamespace>
<AssemblyName>tests</AssemblyName>
<AssemblyName>ink-tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down