Commit be9f0df6 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Renamed LuaInterface -> NLua

parent 2e203153
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -24,7 +24,7 @@
*/
using System;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Static helper methods for Lua tables acting as CLR objects.
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -24,7 +24,7 @@
*/
using System;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Wrapper class for Lua functions as delegates
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -24,7 +24,7 @@
*/
using System;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Base wrapper class for Lua function event handlers.
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -25,10 +25,10 @@
using System;
using System.Reflection;
using System.Collections.Generic;
using LuaInterface.Exceptions;
using LuaInterface.Extensions;
using NLua.Exceptions;
using NLua.Extensions;
namespace LuaInterface.Method
namespace NLua.Method
{
#if USE_KOPILUA
using LuaCore = KopiLua.Lua;
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -24,7 +24,7 @@
*/
using System;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Parameter information
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -24,9 +24,9 @@
*/
using System;
using System.Reflection;
using LuaInterface.Extensions;
using NLua.Extensions;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Cached method
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -25,7 +25,7 @@
using System;
using System.Reflection;
namespace LuaInterface.Method
namespace NLua.Method
{
/*
* Wrapper class for events that does registration/deregistration
......
......@@ -8,9 +8,9 @@
<ProjectGuid>{7064B157-DD57-4828-94C5-CA149B25CB40}</ProjectGuid>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>LuaInterface.IOS</RootNamespace>
<RootNamespace>NLua.IOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>LuaInterface.IOS</AssemblyName>
<AssemblyName>NLua.IOS</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
......@@ -51,7 +51,7 @@
<Folder Include="GenerateEventAssembly\ios\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Config\LuaInterfaceConfig.cs" />
<Compile Include="Config\NLuaConfig.cs" />
<Compile Include="Event\DebugHookEventArgs.cs" />
<Compile Include="Event\EventCodes.cs" />
<Compile Include="Event\EventMasks.cs" />
......
......@@ -8,8 +8,8 @@
<ProjectGuid>{F55CABBB-4108-4A39-94E1-581FD46DC021}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LuaInterface</RootNamespace>
<AssemblyName>LuaInterface</AssemblyName>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<ReleaseVersion>2.x</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
......@@ -77,7 +77,7 @@
<Compile Include="LuaLib\LuaIndexes.cs" />
<Compile Include="LuaLib\GCOptions.cs" />
<Compile Include="LuaLib\LuaLib.cs" />
<Compile Include="Config\LuaInterfaceConfig.cs" />
<Compile Include="Config\NLuaConfig.cs" />
<Compile Include="ObjectTranslatorPool.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -28,11 +28,11 @@ using System.Reflection;
using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
using LuaInterface.Method;
using LuaInterface.Exceptions;
using LuaInterface.Extensions;
using NLua.Method;
using NLua.Exceptions;
using NLua.Extensions;
namespace LuaInterface
namespace NLua
{
#if USE_KOPILUA
using LuaCore = KopiLua.Lua;
......@@ -172,7 +172,7 @@ namespace LuaInterface
}
/*
* Registers the global functions used by LuaInterface
* Registers the global functions used by NLua
*/
private void setGlobalFunctions (LuaCore.lua_State luaState)
{
......
using System;
using System.Collections.Generic;
namespace LuaInterface
namespace NLua
{
#if USE_KOPILUA
using LuaCore = KopiLua.Lua;
......
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -26,18 +26,18 @@ using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using LuaInterface.Config;
using NLua.Config;
// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
[assembly: AssemblyTitle("LuaInterface")]
[assembly: AssemblyDescription(Consts.LuaInterfaceDescription)]
[assembly: AssemblyConfiguration(Consts.LuaInterfaceConfiguration)]
[assembly: AssemblyCompany(Consts.LuaInterfaceCompany)]
[assembly: AssemblyProduct(Consts.LuaInterfaceProduct)]
[assembly: AssemblyCopyright(Consts.LuaInterfaceCopyright)]
[assembly: AssemblyTrademark(Consts.LuaInterfaceTrademark)]
[assembly: AssemblyTitle("NLua")]
[assembly: AssemblyDescription(Consts.NLuaDescription)]
[assembly: AssemblyConfiguration(Consts.NLuaConfiguration)]
[assembly: AssemblyCompany(Consts.NLuaCompany)]
[assembly: AssemblyProduct(Consts.NLuaProduct)]
[assembly: AssemblyCopyright(Consts.NLuaCopyright)]
[assembly: AssemblyTrademark(Consts.NLuaTrademark)]
[assembly: CLSCompliant(true)]
......@@ -56,5 +56,5 @@ using LuaInterface.Config;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion(Consts.LuaInterfaceVersion)]
[assembly: AssemblyFileVersion(Consts.LuaInterfaceFileVersion)]
\ No newline at end of file
[assembly: AssemblyVersion(Consts.NLuaVersion)]
[assembly: AssemblyFileVersion(Consts.NLuaFileVersion)]
\ No newline at end of file
/*
* This file is part of LuaInterface.
* This file is part of NLua.
*
* Copyright (C) 2003-2005 Fabio Mascarenhas de Queiroz.
* Copyright (C) 2012 Megax <http://megax.yeahunter.hu/>
......@@ -26,7 +26,7 @@ using System;
using System.Globalization;
using System.Reflection;
namespace LuaInterface
namespace NLua
{
/// <summary>
/// Summary description for ProxyType.
......
Name: NLua
Description: NLua
Version: 2.x
Requires:
Libs: -r:@expanded_libdir@/@PACKAGE@/NLua.dll
......@@ -3,14 +3,14 @@ EXTRA_DIST = expansions.m4
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG_X86
SUBDIRS = Core Test/TestLuaInterface Applications/LuaRunner
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
if ENABLE_RELEASE_X86
SUBDIRS = Core Test/TestLuaInterface Applications/LuaRunner
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
if ENABLE_DEBUG_X64
SUBDIRS = Core Test/TestLuaInterface Applications/LuaRunner
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
if ENABLE_RELEASE_X64
SUBDIRS = Core Test/TestLuaInterface Applications/LuaRunner
SUBDIRS = Core Test/TestNLua Applications/LuaRunner
endif
PROJECT=LuaInterface.iOS.sln
PROJECT=NLua.iOS.sln
MDTOOL=/Applications/MonoDevelop.app/Contents/MacOS/mdtool
MTOUCH=/Developer/MonoTouch/usr/bin/mtouch
TOUCH_SERVER=./Touch.Server/bin/Debug/Touch.Server.exe
......@@ -15,14 +15,14 @@ build-simulator:
run-simulator: build-simulator touch-server
rm -f sim-results.log
mono --debug $(TOUCH_SERVER) --launchsim ios/LuaInterfaceTestsiOS/bin/iPhoneSimulator/Release/LuaInterfaceTest.app -autoexit -logfile=sim-results.log
mono --debug $(TOUCH_SERVER) --launchsim ios/NLuaTestsiOS/bin/iPhoneSimulator/Release/NLuaTest.app -autoexit -logfile=sim-results.log
cat sim-results.log
build-device:
$(MDTOOL) -v build -t:Build "-c:Release|iPhone" $(PROJECT)
run-device: build-device touch-server
$(MTOUCH) --installdev ios/LuaInterfaceTestsiOS/bin/iPhone/Release/LuaInterfaceTest.app
$(MTOUCH) --installdev ios/NLuaTestsiOS/bin/iPhone/Release/NLuaTest.app
# kill an existing instance (based on the bundle id)
$(MTOUCH) --killdev org.nlua.nluatest
rm -f dev-results.log
......

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterface.IOS", "Core\LuaInterface\LuaInterface.IOS.csproj", "{7064B157-DD57-4828-94C5-CA149B25CB40}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua.IOS", "Core\NLua\NLua.IOS.csproj", "{7064B157-DD57-4828-94C5-CA149B25CB40}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua.IOS", "Core\KopiLua\KopiLua.IOS.csproj", "{44DA9778-C0B0-4C6F-8617-79BA2E0F1361}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua.iOS", "Core\KeraLua\KeraLua.iOS.csproj", "{3F57C208-AA13-4B67-B3E7-ED41307F00A0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterfaceTest", "ios\LuaInterfaceTestsiOS\LuaInterfaceTest.csproj", "{2DC0E43A-21B8-41FF-8793-60AB50350977}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "ios\NLuaTestsiOS\NLuaTest.csproj", "{2DC0E43A-21B8-41FF-8793-60AB50350977}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -87,6 +87,6 @@ Global
{7064B157-DD57-4828-94C5-CA149B25CB40}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ios\LuaInterfaceTestsiOS\LuaInterfaceTest.csproj
StartupItem = ios\NLuaTestsiOS\NLuaTest.csproj
EndGlobalSection
EndGlobal
......@@ -11,9 +11,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{B8664957-C
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KopiLua", "Core\KopiLua\KopiLua.csproj", "{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterface", "Core\LuaInterface\LuaInterface.csproj", "{F55CABBB-4108-4A39-94E1-581FD46DC021}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "Core\NLua\NLua.csproj", "{F55CABBB-4108-4A39-94E1-581FD46DC021}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterfaceTest", "LuaInterfaceTest\LuaInterfaceTest.csproj", "{D5FCADFA-5047-40C2-B392-256875862920}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "NLuaTest\NLuaTest.csproj", "{D5FCADFA-5047-40C2-B392-256875862920}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua", "Core\KeraLua\KeraLua.csproj", "{47153754-10F5-44D8-B578-F5A32B69061A}"
EndProject
......@@ -62,7 +62,7 @@ Global
{47153754-10F5-44D8-B578-F5A32B69061A} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = LuaInterfaceTest\LuaInterfaceTest.csproj
StartupItem = NLuaTest\NLuaTest.csproj
Policies = $0
$0.TextStylePolicy = $3
$1.inheritsSet = null
......@@ -190,7 +190,7 @@ Global
$0.DotNetNamingPolicy = $28
$28.DirectoryNamespaceAssociation = None
$28.ResourceNamePolicy = FileFormatDefault
description = LuaInterface
description = NLua
version = 2.x
EndGlobalSection
EndGlobal
......@@ -8,8 +8,8 @@
<ProjectGuid>{D5FCADFA-5047-40C2-B392-256875862920}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LuaInterfaceTest</RootNamespace>
<AssemblyName>LuaInterfaceTest</AssemblyName>
<RootNamespace>NLuaTest</RootNamespace>
<AssemblyName>NLuaTest</AssemblyName>
<FileAlignment>512</FileAlignment>
<ReleaseVersion>2.x</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
......@@ -61,9 +61,9 @@
<Project>{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}</Project>
<Name>KopiLua</Name>
</ProjectReference>
<ProjectReference Include="..\Core\LuaInterface\LuaInterface.csproj">
<ProjectReference Include="..\Core\NLua\NLua.csproj">
<Project>{F55CABBB-4108-4A39-94E1-581FD46DC021}</Project>
<Name>LuaInterface</Name>
<Name>NLua</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
......@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle ("LuaInterfaceTest")]
[assembly: AssemblyTitle ("NLuaTest")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyProduct ("LuaInterfaceTest")]
[assembly: AssemblyProduct ("NLuaTest")]
[assembly: AssemblyCopyright ("Copyright © 2013")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment