Skip to content

[build] change path used for xabuild in Makefile #997

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

Closed
wants to merge 3 commits into from
Closed

[build] change path used for xabuild in Makefile #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f446d0a
[build] change path used for xabuild in Makefile
jonathanpeppers Nov 1, 2017
a69acd8
Makefile needs to check if xabuild exists
jonathanpeppers Nov 1, 2017
cb7c253
[tests] fixed Forms project TargetFrameworkVersion
jonathanpeppers Nov 2, 2017
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
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ NUNIT_TESTS = \
bin/Test$(CONFIGURATION)/Xamarin.Android.Build.Tests.dll

NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe
XABUILD = bin/$(CONFIGURATION)/bin/xabuild
ifeq ($(wildcard $(XABUILD)),)
XABUILD = tools/scripts/xabuild
endif

ifneq ($(V),0)
MONO_OPTIONS += --debug
Expand All @@ -25,14 +29,14 @@ include build-tools/scripts/msbuild.mk
ifeq ($(USE_MSBUILD),1)
_SLN_BUILD = $(MSBUILD)
else # $(MSBUILD) != 1
_SLN_BUILD = MSBUILD="$(MSBUILD)" tools/scripts/xabuild
_SLN_BUILD = MSBUILD="$(MSBUILD)" $(XABUILD)
endif # $(USE_MSBUILD) == 1

all::
$(_SLN_BUILD) $(MSBUILD_FLAGS) $(SOLUTION)

all-tests::
MSBUILD="$(MSBUILD)" tools/scripts/xabuild $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
MSBUILD="$(MSBUILD)" $(XABUILD) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln

install::
@if [ ! -d "bin/$(CONFIGURATION)" ]; then \
Expand Down Expand Up @@ -130,7 +134,7 @@ rename-test-cases:

clean:
$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android.sln
tools/scripts/xabuild $(MSBUILD_FLAGS) /t:Clean Xamarin.Android-Tests.sln
$(XABUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android-Tests.sln

distclean:
# It may fail if we're cleaning a half-built tree, no harm done if we ignore it
Expand Down Expand Up @@ -181,7 +185,7 @@ TEST_APK_PROJECTS_AOT = \
# Syntax: $(call BUILD_TEST_APK,path/to/project.csproj,additional_msbuild_flags)
define BUILD_TEST_APK
# Must use xabuild to ensure correct assemblies are resolved
MSBUILD="$(MSBUILD)" tools/scripts/xabuild $(MSBUILD_FLAGS) /t:SignAndroidPackage $(2) $(1)
MSBUILD="$(MSBUILD)" $(XABUILD) $(MSBUILD_FLAGS) /t:SignAndroidPackage $(2) $(1)
endef # BUILD_TEST_APK

# Syntax: $(call RUN_APK_TESTS,projects,additional_msbuild_flags)
Expand Down
7 changes: 5 additions & 2 deletions ...in.Forms-Performance-Integration/Droid/Xamarin.Forms.Performance.Integration.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
<OutputType>Library</OutputType>
<RootNamespace>Xamarin.Forms.Performance.Integration.Droid</RootNamespace>
<AssemblyName>Xamarin.Forms.Performance.Integration.Droid</AssemblyName>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<Import Project="..\..\..\Configuration.props" />
<PropertyGroup>
<TargetFrameworkVersion>$(AndroidFrameworkVersion)</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down