vishapoberon/vipak
1
0
Fork 0
mirror of https://github.com/vishapoberon/vipak.git synced 2026-04-05 20:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed most of debug messages.

Browse source
This commit is contained in:
Norayr Chilingarian 2024-02-20 22:08:56 +04:00
parent c7105d95fa
commit b6f55b8a5f
3 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/vpkDot.Mod
View file

@ -19,15 +19,15 @@ BEGIN
lst.AppendString(lst, line); lst.AppendString(lst, line);
i := 0; i := 0;
REPEAT REPEAT
Out.String("entered repeat"); Out.Ln; (* Out.String("entered repeat"); Out.Ln;*)
dep := tree.Get(tree, i); dep := tree.Get(tree, i);
IF dep # NIL THEN IF dep # NIL THEN
Out.String("dep # nil"); Out.Ln; (* Out.String("dep # nil"); Out.Ln;*)
IF dep.deps # NIL THEN IF dep.deps # NIL THEN
Out.String("dep.deps # nil"); Out.Ln; (* Out.String("dep.deps # nil"); Out.Ln;*)
j := 0; j := 0;
REPEAT REPEAT
Out.String("othe repeat");Out.Ln; (* Out.String("other repeat");Out.Ln;*)
IF dep.deps[j]^.name # NIL THEN IF dep.deps[j]^.name # NIL THEN
COPY("", line); COPY("", line);
Strings.Append(tab, line); Strings.Append(tab, line);
@ -35,11 +35,11 @@ BEGIN
Strings.Append(arrow, line); Strings.Append(arrow, line);
Strings.Append(dep.deps[j]^.name^, line); Strings.Append(dep.deps[j]^.name^, line);
lst.AppendString(lst, line); lst.AppendString(lst, line);
Out.String("appends over"); Out.Ln; (* Out.String("appends over"); Out.Ln;*)
END; END;
INC(j); INC(j);
Out.String("j="); Out.Int(j,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; Out.String("len dep.deps"); Out.Int(LEN(dep.deps^), 0); Out.Ln;*)
UNTIL j = (LEN(dep.deps^)); UNTIL j = (LEN(dep.deps^));
END END
END; END;

11
src/vpkInstaller.Mod
View file

@ -48,18 +48,13 @@ VAR
dep: vpkdepTree.Tdep; dep: vpkdepTree.Tdep;
i: LONGINT; i: LONGINT;
BEGIN BEGIN
Out.String("entered vpkInstaller.fetch, prefix="); Out.String(prefix); Out.Ln;
depTree := resolve(package); depTree := resolve(package);
IF a THEN ask END; IF a THEN ask END;
i := 0; i := 0;
REPEAT REPEAT
dep := vpkdepTree.Get(depTree, i); dep := vpkdepTree.Get(depTree, i);
vpkJsonDepRetriever.getURIandType(dep); vpkJsonDepRetriever.getURIandType(dep);
Out.String("vpkInstaller.fetch, repeat bfr vpkSyncer.fetch, prefix=");
Out.String(prefix); Out.Ln;
vpkSyncer.fetch(dep, prefix); vpkSyncer.fetch(dep, prefix);
Out.String("vpkInstaller.fetch, repeat aftr vpkSyncer.fetch, prefix=");
Out.String(prefix); Out.Ln;
INC(i) INC(i)
UNTIL i = depTree.Count; UNTIL i = depTree.Count;
END fetch; END fetch;
@ -76,11 +71,9 @@ VAR
res: INTEGER; res: INTEGER;
domain: ARRAY 256 OF CHAR; domain: ARRAY 256 OF CHAR;
BEGIN BEGIN
Out.String("entered vpkInstaller.build, prefix="); Out.String(prefix); Out.Ln;
IF prefix # "" THEN IF prefix # "" THEN
builddir := vpkEnv.mkBldDir(prefix) builddir := vpkEnv.mkBldDir(prefix)
ELSE ELSE
Out.String("calling vpkEnv.mkdefBldDir"); Out.Ln;
builddir := vpkEnv.mkdefBldDir(); builddir := vpkEnv.mkdefBldDir();
END; END;
depTree := resolve(package); depTree := resolve(package);
@ -95,11 +88,7 @@ BEGIN
IF dep^.Type = vpkSettings.git THEN Out.String("git"); IF dep^.Type = vpkSettings.git THEN Out.String("git");
ELSIF dep^.Type = vpkSettings.https THEN Out.String("https") END; ELSIF dep^.Type = vpkSettings.https THEN Out.String("https") END;
Out.Ln; Out.Ln;
Out.String("vpkInstaller.build, repeat bfr vpkSyncer.fetch, prefix=");
Out.String(prefix); Out.Ln;
vpkSyncer.fetch(dep, prefix); vpkSyncer.fetch(dep, prefix);
Out.String("vpkInstaller.build, repeat bfr vpkSyncer.fetch, prefix=");
Out.String(prefix); Out.Ln;
b := FALSE; b := FALSE;
b := vpkJsonDepRetriever.getBuildInfo(dep, keys, values); b := vpkJsonDepRetriever.getBuildInfo(dep, keys, values);
IF b THEN IF b THEN

3
src/vpkSyncer.Mod
View file

@ -27,18 +27,15 @@ PROCEDURE fetch*(VAR dep: vpkdepTree.Tdep; dst: ARRAY OF CHAR);
VAR domain: ARRAY 64 OF CHAR; VAR domain: ARRAY 64 OF CHAR;
BEGIN BEGIN
vpkTools.extractDomainFromUrl(dep^.rmt^.URI, domain); vpkTools.extractDomainFromUrl(dep^.rmt^.URI, domain);
Out.String("vpkSyncer.fetch, dst="); Out.String(dst); Out.Ln;
IF dst = "" THEN IF dst = "" THEN
vpkEnv.mkdefPkgDirPath(domain, dep^.name^, dst); vpkEnv.mkdefPkgDirPath(domain, dep^.name^, dst);
ELSE ELSE
vpkEnv.mkPkgDirPath(domain, dep^.name^, dst); vpkEnv.mkPkgDirPath(domain, dep^.name^, dst);
END; END;
Out.String("now vpkSyncer.fetch, dst="); Out.String(dst); Out.Ln;
(* dst is changed by mkdefPkgDirPath and mkPkgdirPath *) (* dst is changed by mkdefPkgDirPath and mkPkgdirPath *)
(*IF dep^.Type = vpkSettings.git THEN*) (*IF dep^.Type = vpkSettings.git THEN*)
IF dep^.rmt # NIL THEN IF dep^.rmt # NIL THEN
IF dep^.rmt IS vpkdepTree.RemoteGit 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); vpkGit.fetchRepo(dep^.rmt^.URI, dst, dep^.rmt(vpkdepTree.RemoteGit).branch);
ELSE ELSE
Out.String("TODO: not a git url"); Out.Ln Out.String("TODO: not a git url"); Out.Ln