diff --git a/src/vpkDot.Mod b/src/vpkDot.Mod index 7d9796e..2e5b569 100644 --- a/src/vpkDot.Mod +++ b/src/vpkDot.Mod @@ -19,15 +19,15 @@ BEGIN lst.AppendString(lst, line); i := 0; REPEAT - Out.String("entered repeat"); Out.Ln; + (* Out.String("entered repeat"); Out.Ln;*) dep := tree.Get(tree, i); IF dep # NIL THEN - Out.String("dep # nil"); Out.Ln; + (* Out.String("dep # nil"); Out.Ln;*) IF dep.deps # NIL THEN - Out.String("dep.deps # nil"); Out.Ln; + (* Out.String("dep.deps # nil"); Out.Ln;*) j := 0; REPEAT - Out.String("othe repeat");Out.Ln; + (* Out.String("other repeat");Out.Ln;*) IF dep.deps[j]^.name # NIL THEN COPY("", line); Strings.Append(tab, line); @@ -35,11 +35,11 @@ BEGIN Strings.Append(arrow, line); Strings.Append(dep.deps[j]^.name^, line); lst.AppendString(lst, line); - Out.String("appends over"); Out.Ln; + (* Out.String("appends over"); Out.Ln;*) END; INC(j); - Out.String("j="); Out.Int(j,0); Out.Ln; - Out.String("len dep.deps"); Out.Int(LEN(dep.deps^), 0); Out.Ln; + (*Out.String("j="); Out.Int(j,0); Out.Ln; + Out.String("len dep.deps"); Out.Int(LEN(dep.deps^), 0); Out.Ln;*) UNTIL j = (LEN(dep.deps^)); END END; diff --git a/src/vpkInstaller.Mod b/src/vpkInstaller.Mod index 69b8ccd..d3fec50 100644 --- a/src/vpkInstaller.Mod +++ b/src/vpkInstaller.Mod @@ -48,18 +48,13 @@ VAR dep: vpkdepTree.Tdep; i: LONGINT; BEGIN - Out.String("entered vpkInstaller.fetch, prefix="); Out.String(prefix); Out.Ln; depTree := resolve(package); IF a THEN ask END; i := 0; REPEAT dep := vpkdepTree.Get(depTree, i); vpkJsonDepRetriever.getURIandType(dep); - Out.String("vpkInstaller.fetch, repeat bfr vpkSyncer.fetch, prefix="); - Out.String(prefix); Out.Ln; vpkSyncer.fetch(dep, prefix); - Out.String("vpkInstaller.fetch, repeat aftr vpkSyncer.fetch, prefix="); - Out.String(prefix); Out.Ln; INC(i) UNTIL i = depTree.Count; END fetch; @@ -76,11 +71,9 @@ VAR res: INTEGER; domain: ARRAY 256 OF CHAR; BEGIN - Out.String("entered vpkInstaller.build, prefix="); Out.String(prefix); Out.Ln; IF prefix # "" THEN builddir := vpkEnv.mkBldDir(prefix) ELSE - Out.String("calling vpkEnv.mkdefBldDir"); Out.Ln; builddir := vpkEnv.mkdefBldDir(); END; depTree := resolve(package); @@ -95,11 +88,7 @@ BEGIN IF dep^.Type = vpkSettings.git THEN Out.String("git"); ELSIF dep^.Type = vpkSettings.https THEN Out.String("https") END; Out.Ln; - Out.String("vpkInstaller.build, repeat bfr vpkSyncer.fetch, prefix="); - Out.String(prefix); Out.Ln; vpkSyncer.fetch(dep, prefix); - Out.String("vpkInstaller.build, repeat bfr vpkSyncer.fetch, prefix="); - Out.String(prefix); Out.Ln; b := FALSE; b := vpkJsonDepRetriever.getBuildInfo(dep, keys, values); IF b THEN diff --git a/src/vpkSyncer.Mod b/src/vpkSyncer.Mod index 492029b..07e40cf 100644 --- a/src/vpkSyncer.Mod +++ b/src/vpkSyncer.Mod @@ -27,18 +27,15 @@ PROCEDURE fetch*(VAR dep: vpkdepTree.Tdep; dst: ARRAY OF CHAR); VAR domain: ARRAY 64 OF CHAR; BEGIN vpkTools.extractDomainFromUrl(dep^.rmt^.URI, domain); - Out.String("vpkSyncer.fetch, dst="); Out.String(dst); Out.Ln; IF dst = "" THEN vpkEnv.mkdefPkgDirPath(domain, dep^.name^, dst); ELSE vpkEnv.mkPkgDirPath(domain, dep^.name^, dst); END; - Out.String("now vpkSyncer.fetch, dst="); Out.String(dst); Out.Ln; (* dst is changed by mkdefPkgDirPath and mkPkgdirPath *) (*IF dep^.Type = vpkSettings.git THEN*) IF dep^.rmt # NIL THEN IF dep^.rmt IS vpkdepTree.RemoteGit THEN - Out.String("in vkpSyncer.fetch uri is "); Out.String(dep^.rmt^.URI); Out.Ln; vpkGit.fetchRepo(dep^.rmt^.URI, dst, dep^.rmt(vpkdepTree.RemoteGit).branch); ELSE Out.String("TODO: not a git url"); Out.Ln