Merge pull request #157 from Frakits/for-prs

change linc_discord-rpc to discord-rpc and change hxCodec to install globally instead

commandline/commands/Update.hx

@@ -22,6 +22,7 @@ class Update {
 				name: libNode.att.name,
 				type: libNode.name
 			};
+			if (libNode.has.global) lib.global = libNode.att.global;
 			switch (lib.type) {
 				case "lib":
 					if (libNode.has.version) lib.version = libNode.att.version;
@@ -34,16 +35,17 @@ class Update {
 
         for(lib in libs) {
             // install libs
+	    var globalism = lib.global == "true" ? "--global" : "";
             switch(lib.type) {
                 case "lib":
-                    prettyPrint('Installing "${lib.name}"...');
-                    Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}');
+                    prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}"...');
+                    Sys.command('haxelib $globalism install ${lib.name} ${lib.version != null ? " " + lib.version : " "}');
                 case "git":
-                    prettyPrint('Installing "${lib.name}" from git url "${lib.url}"');
-					if (lib.ref != null)
-                    	Sys.command('haxelib git ${lib.name} ${lib.url} ${lib.ref}');
-					else
-                    	Sys.command('haxelib git ${lib.name} ${lib.url}');
+                    prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}" from git url "${lib.url}"');
+		if (lib.ref != null)
+                    Sys.command('haxelib $globalism git ${lib.name} ${lib.url} ${lib.ref}');
+		else
+                    Sys.command('haxelib $globalism git ${lib.name} ${lib.url}');
                 default:
                     prettyPrint('Cannot resolve library of type "${lib.type}"');
             }
@@ -90,7 +92,8 @@ class Update {
 typedef Library = {
     var name:String;
     var type:String;
+    var ?global:String;
     var ?version:String;
     var ?ref:String;
     var ?url:String;
-}
+}

libs.xml

@@ -8,7 +8,9 @@
 	<git name="hscript-improved" url="https://www.github.com/FNF-CNE-Devs/hscript-improved" ref="custom-classes" />
     <git name="discord-rpc" url="https://github.com/Aidan63/linc_discord-rpc"/>
 	<git name="flxanimate" url="https://github.com/FNF-CNE-Devs/flxanimate/" />
-	<git name="hxCodec" url="https://github.com/polybiusproxy/hxCodec"/>
+	<git name="hxCodec" url="https://github.com/polybiusproxy/hxCodec" global="true"/>
+	<!-- this is to fix a weird haxe bug -->
+	<git name="hxCodec" url="https://github.com/polybiusproxy/hxCodec" global="false"/>
 
 	<!-- Documentation and other features -->
     <lib name="dox"/>
@@ -20,4 +22,4 @@
     <!-- OpenFL & Lime (Required for Flixel) -->
     <lib name="openfl" />
     <lib name="lime" />
-</libraries>
+</libraries>

project.xml

@@ -182,7 +182,7 @@
 	<haxedev set='webgl' />
 
 	<haxelib name="hscript-improved" />
-	<haxelib name="linc_discord-rpc" if="DISCORD_RPC"/>
+	<haxelib name="discord-rpc" if="DISCORD_RPC"/>
 
 	<haxelib name="markdown" />