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

Jump to bottom

Support lib:dev:/path in installFromHxml #467

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Support lib:dev:/path in installFromHxml #467

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4616af
Support lib:dev:/path in installFromHxml
kLabz Sep 17, 2019
d0fea58
Use an enum for lib type
kLabz Sep 17, 2019
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
Binary file modified run.n
View file
Open in desktop
Binary file not shown.
54 changes: 45 additions & 9 deletions src/haxelib/client/Main.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ private enum CommandCategory {
Deprecated(msg:String);
}

private typedef LibInstallationInfo = {
name:String,
version:String,
type:String,
kLabz marked this conversation as resolved.
Show resolved Hide resolved
url:String,
branch:String,
subDir:String,
devPath:String
}

class SiteProxy extends haxe.remoting.Proxy<haxelib.SiteApi> {
}

Expand Down Expand Up @@ -769,7 +779,7 @@ class Main {
'-cpp ' => 'hxcpp',
'-cs ' => 'hxcs',
];
var libsToInstall = new Map<String, {name:String,version:String,type:String,url:String,branch:String,subDir:String}>();
var libsToInstall = new Map<String, LibInstallationInfo>();

function processHxml(path) {
var hxml = normalizeHxml(sys.io.File.getContent(path));
Expand All @@ -781,7 +791,15 @@ class Main {
if (l.startsWith(target)) {
var lib = targets[target];
if (!libsToInstall.exists(lib))
libsToInstall[lib] = { name: lib, version: null, type:"haxelib", url: null, branch: null, subDir: null }
libsToInstall[lib] = {
name: lib,
version: null,
type:"haxelib",
url: null,
branch: null,
subDir: null,
devPath: null
}
}

var libraryFlagEReg = ~/^(-lib|-L|--library)\b/;
Expand All @@ -793,6 +811,7 @@ class Main {
var libVersion:String = null;
var branch:String = null;
var url:String = null;
var devPath:String = null;
var subDir:String = null;
var type:String;

Expand All @@ -806,6 +825,11 @@ class Main {
url = urlParts[0];
branch = urlParts.length > 1 ? urlParts[1] : null;
}
else if ( parts[1].startsWith("dev:") )
{
type = "dev";
devPath = parts[1].substr(4);
}
else
{
type = "haxelib";
Expand All @@ -819,7 +843,15 @@ class Main {

switch libsToInstall[key] {
case null, { version: null } :
libsToInstall.set(key, { name:libName, version:libVersion, type: type, url: url, subDir: subDir, branch: branch } );
libsToInstall.set(key, {
name:libName,
version:libVersion,
type: type,
url: url,
subDir: subDir,
devPath: devPath,
branch: branch
});
default:
}
}
Expand All @@ -838,7 +870,7 @@ class Main {
print("Loading info about the required libraries");
for (l in libsToInstall)
{
if ( l.type == "git" )
if ( l.type == "git" || l.type == "dev" )
{
// Do not check git repository infos
continue;
Expand All @@ -859,6 +891,8 @@ class Main {
for (l in libsToInstall) {
if ( l.type == "haxelib" )
doInstall(rep, l.name, l.version, true);
else if ( l.type == "dev" )
useDev(rep, l.name, l.devPath);
else if ( l.type == "git" )
useVcs(VcsID.Git, function(vcs) doVcsInstall(rep, vcs, l.name, l.url, l.branch, l.subDir, l.version));
else if ( l.type == "hg" )
Expand Down Expand Up @@ -1501,10 +1535,7 @@ class Main {
}
}

function dev() {
var rep = getRepository();
var project = param("Library");
var dir = paramOpt();
function useDev(rep:String, project:String, dir:String) {
var proj = rep + Data.safe(project);
if( !FileSystem.exists(proj) ) {
FileSystem.createDirectory(proj);
Expand All @@ -1531,10 +1562,15 @@ class Main {
print('Could not write to $devfile');
}
}

}
}

function dev() {
var rep = getRepository();
var project = param("Library");
var dir = paramOpt();
useDev(rep, project, dir);
}

function removeExistingDevLib(proj:String):Void {
//TODO: ask if existing repo have changes.
Expand Down