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

changes stabilized

Browse source
This commit is contained in:
Norayr Chilingarian 2022-06-30 20:51:30 +04:00
parent 8ff51322f4
commit 5659a3f155
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
makefile
View file

@ -11,7 +11,7 @@ DPS = dps
VIPACK = vipack VIPACK = vipack
all: deps all: deps vipack
#git submodule init #git submodule init
#git submodule update #git submodule update
@ -21,6 +21,7 @@ all: deps
gmake -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path) gmake -f $(mkfile_dir_path)/dps/Internet/makefile BUILD=$(build_dir_path)
gmake -f $(mkfile_dir_path)/dps/time/Makefile BUILD=$(build_dir_path) gmake -f $(mkfile_dir_path)/dps/time/Makefile BUILD=$(build_dir_path)
gmake -f $(mkfile_dir_path)/dps/opts/Makefile BUILD=$(build_dir_path) gmake -f $(mkfile_dir_path)/dps/opts/Makefile BUILD=$(build_dir_path)
vipack:
cd $(build_dir_path) && \ cd $(build_dir_path) && \
$(VOC) -s \ $(VOC) -s \
../src/vpkSettings.Mod \ ../src/vpkSettings.Mod \

14
src/unix/vpkGit.Mod
View file

@ -1,20 +1,30 @@
MODULE vpkGit; MODULE vpkGit;
IMPORT Out, Strings, Platform, vpkEnv; IMPORT Out, Strings, Platform, vpkEnv;
PROCEDURE pull*(url : ARRAY OF CHAR; dst : ARRAY OF CHAR; branch: ARRAY OF CHAR); PROCEDURE pull*(VAR url : ARRAY OF CHAR; VAR dst : ARRAY OF CHAR; VAR branch: ARRAY OF CHAR);
VAR i : INTEGER; VAR i : INTEGER;
cmd : ARRAY 2048 OF CHAR; cmd : ARRAY 2048 OF CHAR;
BEGIN BEGIN
cmd:= "git init "; cmd := "git init ";
Strings.Append(dst, cmd); Strings.Append(dst, cmd);
i:=Platform.System(cmd); i:=Platform.System(cmd);
(*cmd := "git -C ";
Strings.Append(dst, cmd);
Strings.Append(" remote add origin ", cmd);
Strings.Append(url, cmd);
i:=Platform.System(cmd);*)
cmd := ""; cmd := "";
cmd := "git -C "; cmd := "git -C ";
Strings.Append(dst, cmd); Strings.Append(dst, cmd);
Strings.Append(" pull ", cmd); Strings.Append(" pull ", cmd);
Strings.Append(url, cmd); Strings.Append(url, cmd);
Out.String("branch: '"); Out.String(branch); Out.String("'."); Out.Ln;
IF branch # "" THEN
Out.String("adding branch to commandline"); Out.Ln;
Strings.Append(" ", cmd); Strings.Append(" ", cmd);
Strings.Append(branch, cmd); Strings.Append(branch, cmd);
END;
Out.String("fetch command: '"); Out.String(cmd); Out.Char("'"); Out.Ln;
i := Platform.System(cmd); i := Platform.System(cmd);
END pull; END pull;

3
src/vpkConf.Mod
View file

@ -55,6 +55,9 @@ VAR
treeTyp: ARRAY 8 OF CHAR; treeTyp: ARRAY 8 OF CHAR;
branch: ARRAY 128 OF CHAR; branch: ARRAY 128 OF CHAR;
BEGIN BEGIN
COPY("", tree.branch);
COPY("", tree.url);
COPY("", branch);
f := vpkEnv.getConfFile(); f := vpkEnv.getConfFile();
Files.Set(r, f, 0); Files.Set(r, f, 0);
i := 0; i := 0;