kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move native DLL directory to 'lib'"

Browse Source 
This reverts commit 20f626dab8.
This commit is contained in:
Joshua Granick
2019-06-24 10:37:22 -07:00
parent f637bdd8ef
commit ef154d2916
15 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -4,8 +4,6 @@
Export/
ndll/*/lime*
ndll/*/liblime*
lib/*/lime*
lib/*/liblime*
project/all_objs
project/obj
project/vc*.pdb

0
ndll/Linux/.gitignore vendored Normal file
View File

0
ndll/Linux64/.gitignore vendored Normal file
View File

0
ndll/Mac/.gitignore vendored Normal file
View File

0
ndll/Mac64/.gitignore vendored Normal file
View File

0
ndll/Windows/.gitignore vendored Normal file
View File

6
project/Build.xml
View File

@@ -42,7 +42,7 @@
<set name="LIME_WEBM" value="1" /> -->
<set name="LIME_ZLIB" value="1" />
<set name="OUTPUT_DIR" value="../lib" unless="OUTPUT_DIR" />
<set name="OUTPUT_DIR" value="../ndll" unless="OUTPUT_DIR" />
<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH" />
<set name="NATIVE_TOOLKIT_HAVE_CAIRO" value="1" if="LIME_CAIRO" />
@@ -390,7 +390,7 @@
<ext value=".so" />
<ext value=".ndll" if="windows || mac || linux" />
<!-- TODO: Support single binary? -->
<!-- TODO: Support single binary -->
<ext value=".hdll" if="LIME_HASHLINK" />
<section if="windows">
@@ -467,7 +467,7 @@
<section if="android">
<lib name="-L../lib/Android" />
<lib name="-L../ndll/Android" />
<lib name="-ldl" />
<lib name="-llog" />

BIN
run.n vendored
View File

Binary file not shown.

4
src/lime/system/CFFI.hx
View File

@@ -154,11 +154,11 @@ class CFFI
if (haxelib != "")
{
result = __tryLoad(haxelib + slash + "lib" + slash + __sysName() + slash + library, library, method, args);
result = __tryLoad(haxelib + slash + "ndll" + slash + __sysName() + slash + library, library, method, args);
if (result == null)
{
result = __tryLoad(haxelib + slash + "lib" + slash + __sysName() + "64" + slash + library, library, method, args);
result = __tryLoad(haxelib + slash + "ndll" + slash + __sysName() + "64" + slash + library, library, method, args);
}
}
}

BIN
svg.n
View File

Binary file not shown.

3
templates/extension/project/Build.xml
View File

@@ -19,9 +19,8 @@
<target id="NDLL" output="${LIBPREFIX}::extensionLowerCase::${MSVC_LIB_VERSION}${DEBUGEXTRA}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<outdir name="../lib/${BINDIR}"/>
<outdir name="../ndll/${BINDIR}"/>
<ext value=".ndll" if="windows || mac || linux"/>
<ext value=".hdll" if="hashlink"/>
<files id="common"/>
</target>

20
tools/CommandLineTools.hx
View File

@@ -439,11 +439,11 @@ class CommandLineTools
if (FileSystem.exists("tools.n"))
{
path = Path.combine(Sys.getCwd(), "../lib/");
path = Path.combine(Sys.getCwd(), "../ndll/");
}
else if (FileSystem.exists("run.n"))
{
path = Sys.getCwd() + "/lib/";
path = Sys.getCwd() + "/ndll/";
}
if (path == "")
@@ -456,21 +456,9 @@ class CommandLineTools
{
var line = StringTools.trim(process.stdout.readLine());
if (line.length > 0 && !StringTools.startsWith(line, "-"))
if (StringTools.startsWith(line, "-L "))
{
path = StringTools.trim(line);
if (FileSystem.exists(Path.combine(path, "../lib")))
{
path = Path.combine(path, "../lib");
}
else
{
path = Path.combine(path, "../ndll");
}
if (!StringTools.endsWith(path, "/"))
{
path += "/";
}
path = StringTools.trim(line.substr(2));
break;
}
}

21
tools/RunScript.hx
View File

@@ -17,15 +17,30 @@ class RunScript
toolsDirectory = Path.combine(limeDirectory, "../tools");
}
/*var extendedToolsDirectory = Haxelib.getPath (new Haxelib ("lime-extended"), false);
if (extendedToolsDirectory != null && extendedToolsDirectory != "") {
var buildScript = File.getContent (Path.combine (extendedToolsDirectory, "tools.hxml"));
buildScript = StringTools.replace (buildScript, "\r\n", "\n");
buildScript = StringTools.replace (buildScript, "\n", " ");
System.runCommand (toolsDirectory, "haxe", buildScript.split (" "));
} else {*/
System.runCommand(toolsDirectory, "haxe", ["tools.hxml"]);
// }
if (!rebuildBinaries) return;
var platforms = ["Windows", "Mac", "Mac64", "Linux", "Linux64"];
for (platform in platforms)
{
var source = Path.combine(limeDirectory, "lib/" + platform + "/lime.ndll");
var source = Path.combine(limeDirectory, "ndll/" + platform + "/lime.ndll");
// var target = Path.combine (toolsDirectory, "ndll/" + platform + "/lime.ndll");
if (!FileSystem.exists(source))
{
@@ -76,6 +91,10 @@ class RunScript
Log.warn("", "Source path \"" + source + "\" does not exist");
}
}
else
{
// System.copyIfNewer (source, target);
}
}
}

18
tools/SVGExport.hx
View File

@@ -24,7 +24,7 @@ class SVGExport
if (FileSystem.exists("svg.n"))
{
path = Path.combine(Sys.getCwd(), "../lib/");
path = Path.combine(Sys.getCwd(), "../ndll/");
}
if (path == "")
@@ -37,21 +37,9 @@ class SVGExport
{
var line = StringTools.trim(process.stdout.readLine());
if (line.length > 0 && !StringTools.startsWith(line, "-"))
if (StringTools.startsWith(line, "-L "))
{
path = StringTools.trim(line);
if (FileSystem.exists(Path.combine(path, "../lib")))
{
path = Path.combine(path, "../lib");
}
else
{
path = Path.combine(path, "../ndll");
}
if (!StringTools.endsWith(path, "/"))
{
path += "/";
}
path = StringTools.trim(line.substr(2));
break;
}
}

10
tools/utils/CreateTemplate.hx
View File

@@ -56,6 +56,16 @@ class CreateTemplate
FileSystem.rename(title + "/dependencies/android/src/main/java/org/haxe/extension/Extension.java",
title + "/dependencies/android/src/main/java/org/haxe/extension/" + file + ".java");
}
if (FileSystem.exists(title))
{
System.mkdir(title + "/ndll");
System.mkdir(title + "/ndll/Linux");
System.mkdir(title + "/ndll/Linux64");
System.mkdir(title + "/ndll/Mac");
System.mkdir(title + "/ndll/Mac64");
System.mkdir(title + "/ndll/Windows");
}
}
public static function createProject(words:Array<String>, userDefines:Map<String, Dynamic>, overrides:HXProject):Void