Update build scripts

Author: ScottPJones

.travis.yml

@@ -20,7 +20,7 @@ matrix:
 # uncomment the following lines to override the default test script
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'if VERSION < v"0.7.0-DEV.5183" ; for n in ("ModuleInterfaceTools", "MurmurHash3", "Format", "StrAPI", "CharSetEncodings", "ChrBase"); Pkg.add(n); end ; for n in ("StrBase", "StrLiterals") ; Pkg.clone("https://github.com/JuliaString/$n.jl") ; end ; Pkg.clone(pwd()) ; else; Pkg.up(); end ; Pkg.test("StrFormat"; coverage=true)'
+  - julia -e 'mit = "ModuleInterfaceTools"; mh3 = "MurmurHash3"; loc = "https://github.com/JuliaString"; sb="StrBase"; sl="StrLiterals"; la = ("Format", "StrAPI", "CharSetEncodings", "ChrBase"); if VERSION < v"0.7.0-DEV.5183"; cln = Pkg.clone; cln("$loc/$mit.jl"); cln("$loc/$mh3.jl"); for n in la; Pkg.add(n); end; cln("$loc/$sb.jl"); cln("$loc/$sl.jl"); cln(pwd()); else; using Pkg; cln(a)=Pkg.add("$loc/$a.jl.git"); cln(mit); cln(mh3); for n in la; cln(n); end; cln(sb); cln(sl); end; Pkg.test("StrFormat"; coverage=true)'
 after_success:
   # push coverage results to Coveralls
   - julia -e 'cd(Pkg.dir("StrFormat")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.6
 Format
-StrLiterals
+ChrBase
+#StrLiterals

appveyor.yml

@@ -41,14 +41,20 @@ build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)
   - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
-      versioninfo(); pkg = \"StrFormat\";
-      la = (\"ModuleInterfaceTools\", \"MurmurHash3\", \"Format\", \"StrAPI\", \"CharSetEncodings\", \"ChrBase\");
-      lc = (\"StrBase\", \"StrLiterals\");
+      versioninfo(); mit = \"ModuleInterfaceTools\"; mh3 = \"MurmurHash3\";
+      loc = \"https://github.com/JuliaString\"; sb = \"StrBase\"; sl = \"StrLiterals\";
+      la = (\"Format\", \"StrAPI\", \"CharSetEncodings\", \"ChrBase\");
       if VERSION < v\"0.7.0-DEV.5183\";
+         cln(a) = Pkg.clone(\"$loc/$a.jl.git\", a);
+         cln(mit); cln(mh3);
          for n in la; Pkg.add(n); end;
-         for n in lc; Pkg.clone(\"https://github.com/JuliaString/$n.jl.git\", n); end;
-         Pkg.clone(pwd(), pkg);
-      else; Pkg.up(); end"
+         cln(sb); cln(sl);
+         Pkg.clone(pwd(), \"StrFormat\");
+      else;
+         using Pkg;
+         cln(a) = Pkg.add(\"$loc/$a.jl.git\");
+         cln(mit); cln(mh3); for n in la; cln(n); end; cln(sb); cln(sl);
+      end"
 
 test_script:
   - C:\projects\julia\bin\julia -e "Pkg.test(\"StrFormat\")"