Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
NLua
Commits
a815509b
"Core/LuaInterface/Lua.cs" did not exist on "6336b46a4ead0becf82f730cf9a7f8746e36f7d4"
Commit
a815509b
authored
Jun 29, 2014
by
Vinicius Jarina
Browse files
[build] Better Android build.
parent
297e9608
Changes
7
Hide whitespace changes
Inline
Side-by-side
KeraLua
@
92c46b95
Compare
60b2f79a
...
92c46b95
Subproject commit
60b2f79a5e9602c7288809d48fbd44b801f03d9d
Subproject commit
92c46b95071f5c0aefd9033b25fd7d215cf8879a
Makefile.Android
0 → 100644
View file @
a815509b
PROJECT
=
NLua.Android.sln
MDTOOL
=
/Applications/Xamarin
\
Studio.app/Contents/MacOS/mdtool
all
:
build
run run-test
:
run-device
build
:
$(MDTOOL)
-v
build
-t
:Build
"-c:Release"
$(PROJECT)
NLuaTests.Android/NLuaTest.Android.csproj
View file @
a815509b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<PropertyGroup>
<PropertyGroup>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<ProductVersion>
10.0.0
</ProductVersion>
<ProductVersion>
8.0.30703
</ProductVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<SchemaVersion>
2.0
</SchemaVersion>
<ProjectGuid>
{401B1795-0B7C-4F20-AE9D-F8685D15A825}
</ProjectGuid>
<ProjectGuid>
{401B1795-0B7C-4F20-AE9D-F8685D15A825}
</ProjectGuid>
<ProjectTypeGuids>
{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
<ProjectTypeGuids>
{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
<WarningLevel>
4
</WarningLevel>
<WarningLevel>
4
</WarningLevel>
<AndroidUseSharedRuntime>
false
</AndroidUseSharedRuntime>
<AndroidUseSharedRuntime>
false
</AndroidUseSharedRuntime>
<ConsolePause>
false
</ConsolePause>
<ConsolePause>
false
</ConsolePause>
<AndroidSupportedAbis>
armeabi;armeabi-v7a;x86
</AndroidSupportedAbis>
</PropertyGroup>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference
Include=
"System"
/>
<Reference
Include=
"System"
/>
...
...
NLuaTests.Android/Resources/Resource.designer.cs
View file @
a815509b
...
@@ -90,8 +90,8 @@ namespace NLuaTests.Android
...
@@ -90,8 +90,8 @@ namespace NLuaTests.Android
// aapt resource value: 0x7f040000
// aapt resource value: 0x7f040000
public
const
int
OptionRemoteServer
=
2130968576
;
public
const
int
OptionRemoteServer
=
2130968576
;
// aapt resource value: 0x7f0400
1
0
// aapt resource value: 0x7f04000
f
public
const
int
OptionsButton
=
213096859
2
;
public
const
int
OptionsButton
=
213096859
1
;
// aapt resource value: 0x7f04000a
// aapt resource value: 0x7f04000a
public
const
int
ResultFullName
=
2130968586
;
public
const
int
ResultFullName
=
2130968586
;
...
@@ -126,11 +126,11 @@ namespace NLuaTests.Android
...
@@ -126,11 +126,11 @@ namespace NLuaTests.Android
// aapt resource value: 0x7f040004
// aapt resource value: 0x7f040004
public
const
int
ResultsResult
=
2130968580
;
public
const
int
ResultsResult
=
2130968580
;
// aapt resource value: 0x7f04000f
public
const
int
RunTestsButton
=
2130968591
;
// aapt resource value: 0x7f04000e
// aapt resource value: 0x7f04000e
public
const
int
TestSuiteListView
=
2130968590
;
public
const
int
RunTestsButton
=
2130968590
;
// aapt resource value: 0x7f040010
public
const
int
TestSuiteListView
=
2130968592
;
static
Id
()
static
Id
()
{
{
...
...
run_all.android.sh
0 → 100755
View file @
a815509b
#!/bin/sh
cd
Core/KeraLua
make
-f
Makefile.Android
cd
../../
make
-f
Makefile.Android
run_all.win32.bat
View file @
a815509b
...
@@ -4,7 +4,7 @@ call Makefile.Win32.bat
...
@@ -4,7 +4,7 @@ call Makefile.Win32.bat
msbuild
KeraLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
/p
:Platform
=
"Any CPU"
msbuild
KeraLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
/p
:Platform
=
"Any CPU"
cd
..\..
cd
..\..
xcopy
Core
\KeraLua\external\lua\win32\bin\
*
.dll
tests
\
*
.dll
xcopy
Core
\KeraLua\external\lua\win32\bin\
*
.dll
tests
\
*
.dll
msbuild
NLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
;
LUA_CORE
;
CATCH_EXCEPTIONS
/p
:Platform
=
"Any CPU"
msbuild
NLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
"
WSTRING;LUA_CORE;CATCH_EXCEPTIONS
"
/p
:Platform
=
"Any CPU"
cd
tests
/
cd
tests
/
nunit
-console
NLuaTest
.dll
/xml
=
$1
nunit
-console
NLuaTest
.dll
/xml
=
$1
cd
..
cd
..
...
...
run_all.win64.bat
View file @
a815509b
...
@@ -4,7 +4,7 @@ call Makefile.Win64.bat
...
@@ -4,7 +4,7 @@ call Makefile.Win64.bat
msbuild
KeraLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
/p
:Platform
=
"Any CPU"
msbuild
KeraLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
/p
:Platform
=
"Any CPU"
cd
..\..
cd
..\..
xcopy
Core
\KeraLua\external\lua\win64\bin64\
*
.dll
tests
\
*
.dll
xcopy
Core
\KeraLua\external\lua\win64\bin64\
*
.dll
tests
\
*
.dll
msbuild
NLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
WSTRING
;
LUA_CORE
;
CATCH_EXCEPTIONS
/p
:Platform
=
"Any CPU"
msbuild
NLua
.Net40.sln
/p
:Configuration
=
Release
/p
:DefineConstants
=
"
WSTRING;LUA_CORE;CATCH_EXCEPTIONS
"
/p
:Platform
=
"Any CPU"
cd
tests
/
cd
tests
/
nunit
-console
NLuaTest
.dll
/xml
=
$1
nunit
-console
NLuaTest
.dll
/xml
=
$1
cd
..
cd
..
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment