mirror of
https://github.com/vishapoberon/vipak.git
synced 2026-04-05 20:42:26 +00:00
forgot to add local builder.
This commit is contained in:
Norayr Chilingarian
parent
81b0414238
commit
b6ae2ad096
2 changed files with 475 additions and 3 deletions
|
|
@ -85,8 +85,8 @@ BEGIN
|
|||
opt := opts.createOpt();
|
||||
opts.setOptName(opt, "-l");
|
||||
opts.setOptLName(opt, "--local");
|
||||
opts.setOptHasVal(opt, TRUE);
|
||||
opts.setOptDesc(opt, "build local project from specified vipak.json file");
|
||||
opts.setOptHasVal(opt, FALSE);
|
||||
opts.setOptDesc(opt, "build local project from vipak.json file");
|
||||
opts.setOptRequired(opt, FALSE);
|
||||
options.add(options, opt);
|
||||
|
||||
|
|
@ -157,7 +157,6 @@ BEGIN
|
|||
IF pkgTree = "" THEN
|
||||
Out.String(" will use the default package tree location"); Out.Ln;
|
||||
END;
|
||||
opts.valOfOpt("-l", foptions, localFile);
|
||||
|
||||
IF pkgTree # "" THEN vpkConf.setTreeDir(pkgTree) END;
|
||||
|
||||
|
|
|
|||
473
src/vpkLocalBuilder.Mod
Normal file
473
src/vpkLocalBuilder.Mod
Normal file
|
|
@ -0,0 +1,473 @@
|
|||
MODULE vpkLocalBuilder;
|
||||
IMPORT Files, Out, Strings, Platform, In,
|
||||
Json, StringList, strUtils,
|
||||
vpkStorage, vpkSettings, vpkdepTree, vpkInstaller, vpkEnv, vpkJsonDepRetriever,
|
||||
UnixFS;
|
||||
|
||||
CONST
|
||||
DefaultProjectFile = "vipak.json";
|
||||
DefaultBuildDir = "build";
|
||||
ErrmessSize = 4096;
|
||||
|
||||
VAR
|
||||
eol: ARRAY 3 OF CHAR;
|
||||
|
||||
TYPE
|
||||
ProjectInfo = RECORD
|
||||
name: ARRAY 64 OF CHAR;
|
||||
author: ARRAY 64 OF CHAR;
|
||||
license: ARRAY 32 OF CHAR;
|
||||
version: ARRAY 16 OF CHAR;
|
||||
hasDeps: BOOLEAN;
|
||||
hasBuild: BOOLEAN;
|
||||
END;
|
||||
|
||||
PROCEDURE getBuildInfoFromLocalFile(VAR projectFile: ARRAY OF CHAR; VAR k, v: StringList.TStringList): BOOLEAN;
|
||||
VAR
|
||||
jsonstr, errstr: strUtils.pstring;
|
||||
tree, buildValue, command, file: Json.Value;
|
||||
rootObj, buildStep: Json.Obj;
|
||||
buildArray: Json.Arr;
|
||||
cm, fl, bl: Json.jString;
|
||||
b: BOOLEAN;
|
||||
BEGIN
|
||||
k := NIL; v := NIL;
|
||||
b := FALSE;
|
||||
jsonstr := NIL;
|
||||
|
||||
(* Read from specified file *)
|
||||
vpkStorage.fileToString(projectFile, jsonstr);
|
||||
|
||||
IF jsonstr # NIL THEN
|
||||
NEW(errstr, ErrmessSize);
|
||||
b := Json.Parse(tree, jsonstr^, errstr^);
|
||||
IF b THEN
|
||||
IF tree IS Json.Obj THEN
|
||||
rootObj := tree(Json.Obj);
|
||||
NEW(bl, Strings.Length(vpkSettings.bldType) + 1);
|
||||
COPY(vpkSettings.bldType, bl^);
|
||||
IF Json.ObjSelect(buildValue, rootObj, bl) THEN
|
||||
IF buildValue IS Json.Arr THEN
|
||||
buildArray := buildValue(Json.Arr);
|
||||
WHILE buildArray # NIL DO
|
||||
(* buildArray.value should contain the build step object *)
|
||||
IF buildArray.value IS Json.Obj THEN
|
||||
buildStep := buildArray.value(Json.Obj);
|
||||
NEW(cm, Strings.Length(vpkSettings.bldCommand) + 1);
|
||||
NEW(fl, Strings.Length(vpkSettings.bldFile) + 1);
|
||||
COPY(vpkSettings.bldCommand, cm^);
|
||||
COPY(vpkSettings.bldFile, fl^);
|
||||
|
||||
(* Look for "command" and "file" keys in the build step object *)
|
||||
IF Json.ObjSelect(command, buildStep, cm) & Json.ObjSelect(file, buildStep, fl) THEN
|
||||
IF (command IS Json.Str) & (file IS Json.Str) THEN
|
||||
IF k = NIL THEN k := StringList.Create() END;
|
||||
IF v = NIL THEN v := StringList.Create() END;
|
||||
k.AppendString(k, command(Json.Str).str^);
|
||||
v.AppendString(v, file(Json.Str).str^);
|
||||
Out.String("Found build step: "); Out.String(command(Json.Str).str^);
|
||||
Out.String(" "); Out.String(file(Json.Str).str^); Out.Ln;
|
||||
ELSE
|
||||
Out.String("command and file must be strings"); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build step missing 'command' or 'file' fields"); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build array element is not an object"); Out.Ln;
|
||||
END;
|
||||
buildArray := buildArray.next;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build section is not an array."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build section not found."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON root is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON parsing failed: "); Out.String(errstr^); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("No JSON string provided."); Out.Ln;
|
||||
END;
|
||||
RETURN (k # NIL) & (v # NIL) & (k.Count > 0);
|
||||
END getBuildInfoFromLocalFile;
|
||||
|
||||
PROCEDURE createTemplateModule(VAR projectName: ARRAY OF CHAR);
|
||||
VAR
|
||||
filename: ARRAY 80 OF CHAR;
|
||||
content: ARRAY 512 OF CHAR;
|
||||
f: Files.File;
|
||||
r: Files.Rider;
|
||||
srcDir: UnixFS.fileInfo;
|
||||
BEGIN
|
||||
(* Create src directory first *)
|
||||
COPY("src", srcDir.name);
|
||||
IF ~UnixFS.Exists(srcDir) THEN
|
||||
IF UnixFS.mkDir("src") THEN
|
||||
Out.String("Created src directory"); Out.Ln;
|
||||
ELSE
|
||||
Out.String("Failed to create src directory"); Out.Ln;
|
||||
RETURN;
|
||||
END;
|
||||
END;
|
||||
|
||||
(* Create module filename in src directory *)
|
||||
COPY("src/", filename);
|
||||
Strings.Append(projectName, filename);
|
||||
Strings.Append(".Mod", filename);
|
||||
|
||||
(* Create template module content *)
|
||||
COPY("MODULE ", content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append(";", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("IMPORT Out;", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("PROCEDURE main;", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("BEGIN", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' Out.String("Hello from ', content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append('!"); Out.Ln;', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' Out.String("This project was built using vipak --local"); Out.Ln;', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("END main;", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("BEGIN", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(" main", content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append("END ", content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append(".", content);
|
||||
|
||||
f := Files.New(filename);
|
||||
IF f # NIL THEN
|
||||
Files.Set(r, f, 0);
|
||||
Files.WriteBytes(r, content, Strings.Length(content));
|
||||
Files.Register(f);
|
||||
Files.Close(f);
|
||||
Out.String("Created template module: "); Out.String(filename); Out.Ln;
|
||||
ELSE
|
||||
Out.String("Failed to create template module: "); Out.String(filename); Out.Ln;
|
||||
END;
|
||||
END createTemplateModule;
|
||||
|
||||
PROCEDURE createDefaultProject*(VAR filename: ARRAY OF CHAR);
|
||||
VAR
|
||||
content: ARRAY 1024 OF CHAR;
|
||||
f: Files.File;
|
||||
r: Files.Rider;
|
||||
projectName: ARRAY 64 OF CHAR;
|
||||
BEGIN
|
||||
(* Use a simple default project name *)
|
||||
COPY("myproject", projectName);
|
||||
|
||||
(* Create default JSON content *)
|
||||
COPY('{', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Package": "', content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append('",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Author": "Your Name",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "License": "GPL-3",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Version": "0.1",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Remote": {', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "type": "git",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "path": "https://codeberg.org/yourname/', content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append('",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "tag": "0.1"', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' },', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Dependencies": {', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "opts": "0.1"', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' },', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "Build": [', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' {', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "command": "voc -m",', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' "file": "src/', content);
|
||||
Strings.Append(projectName, content);
|
||||
Strings.Append('.Mod"', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' }', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append(' ]', content);
|
||||
Strings.Append(eol, content);
|
||||
Strings.Append('}', content);
|
||||
|
||||
f := Files.New(filename);
|
||||
IF f # NIL THEN
|
||||
Files.Set(r, f, 0);
|
||||
Files.WriteBytes(r, content, Strings.Length(content));
|
||||
Files.Register(f);
|
||||
Files.Close(f);
|
||||
Out.String("Created default project file: "); Out.String(filename); Out.Ln;
|
||||
ELSE
|
||||
Out.String("Failed to create project file: "); Out.String(filename); Out.Ln;
|
||||
HALT(1);
|
||||
END;
|
||||
END createDefaultProject;
|
||||
|
||||
PROCEDURE fileExists(VAR filename: ARRAY OF CHAR): BOOLEAN;
|
||||
VAR fi: UnixFS.fileInfo;
|
||||
BEGIN
|
||||
COPY(filename, fi.name);
|
||||
RETURN UnixFS.Exists(fi);
|
||||
END fileExists;
|
||||
|
||||
PROCEDURE parseProjectFile(VAR filename: ARRAY OF CHAR; VAR info: ProjectInfo): BOOLEAN;
|
||||
VAR
|
||||
jsonstr, errstr: strUtils.pstring;
|
||||
tree, packageValue, authorValue, licenseValue, versionValue: Json.Value;
|
||||
depsValue, buildValue: Json.Value;
|
||||
rootObj: Json.Obj;
|
||||
packageKey, authorKey, licenseKey, versionKey: Json.jString;
|
||||
depsKey, buildKey: Json.jString;
|
||||
b: BOOLEAN;
|
||||
BEGIN
|
||||
info.hasDeps := FALSE;
|
||||
info.hasBuild := FALSE;
|
||||
COPY("", info.name);
|
||||
COPY("", info.author);
|
||||
COPY("", info.license);
|
||||
COPY("", info.version);
|
||||
|
||||
vpkStorage.fileToString(filename, jsonstr);
|
||||
IF jsonstr # NIL THEN
|
||||
NEW(errstr, ErrmessSize);
|
||||
b := Json.Parse(tree, jsonstr^, errstr^);
|
||||
IF b THEN
|
||||
IF tree IS Json.Obj THEN
|
||||
rootObj := tree(Json.Obj);
|
||||
|
||||
(* Parse Package name *)
|
||||
NEW(packageKey, Strings.Length(vpkSettings.pkgTypKey) + 1);
|
||||
COPY(vpkSettings.pkgTypKey, packageKey^);
|
||||
IF Json.ObjSelect(packageValue, rootObj, packageKey) THEN
|
||||
IF packageValue IS Json.Str THEN
|
||||
COPY(packageValue(Json.Str).str^, info.name);
|
||||
END;
|
||||
END;
|
||||
|
||||
(* Parse Author *)
|
||||
NEW(authorKey, 7); COPY("Author", authorKey^);
|
||||
IF Json.ObjSelect(authorValue, rootObj, authorKey) THEN
|
||||
IF authorValue IS Json.Str THEN
|
||||
COPY(authorValue(Json.Str).str^, info.author);
|
||||
END;
|
||||
END;
|
||||
|
||||
(* Parse License *)
|
||||
NEW(licenseKey, 8); COPY("License", licenseKey^);
|
||||
IF Json.ObjSelect(licenseValue, rootObj, licenseKey) THEN
|
||||
IF licenseValue IS Json.Str THEN
|
||||
COPY(licenseValue(Json.Str).str^, info.license);
|
||||
END;
|
||||
END;
|
||||
|
||||
(* Parse Version *)
|
||||
NEW(versionKey, 8); COPY("Version", versionKey^);
|
||||
IF Json.ObjSelect(versionValue, rootObj, versionKey) THEN
|
||||
IF versionValue IS Json.Str THEN
|
||||
COPY(versionValue(Json.Str).str^, info.version);
|
||||
END;
|
||||
END;
|
||||
|
||||
(* Check for Dependencies *)
|
||||
NEW(depsKey, Strings.Length(vpkSettings.depTypKey) + 1);
|
||||
COPY(vpkSettings.depTypKey, depsKey^);
|
||||
IF Json.ObjSelect(depsValue, rootObj, depsKey) THEN
|
||||
info.hasDeps := TRUE;
|
||||
END;
|
||||
|
||||
(* Check for Build section *)
|
||||
NEW(buildKey, Strings.Length(vpkSettings.bldType) + 1);
|
||||
COPY(vpkSettings.bldType, buildKey^);
|
||||
IF Json.ObjSelect(buildValue, rootObj, buildKey) THEN
|
||||
info.hasBuild := TRUE;
|
||||
END;
|
||||
|
||||
RETURN TRUE;
|
||||
ELSE
|
||||
Out.String("JSON root is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON parsing failed: "); Out.String(errstr^); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Failed to read project file."); Out.Ln;
|
||||
END;
|
||||
RETURN FALSE;
|
||||
END parseProjectFile;
|
||||
|
||||
PROCEDURE createBuildDir(): BOOLEAN;
|
||||
VAR
|
||||
fi: UnixFS.fileInfo;
|
||||
BEGIN
|
||||
COPY(DefaultBuildDir, fi.name);
|
||||
IF ~UnixFS.Exists(fi) THEN
|
||||
IF UnixFS.mkDir(DefaultBuildDir) THEN
|
||||
Out.String("Created build directory: "); Out.String(DefaultBuildDir); Out.Ln;
|
||||
ELSE
|
||||
Out.String("Failed to create build directory: "); Out.String(DefaultBuildDir); Out.Ln;
|
||||
RETURN FALSE;
|
||||
END;
|
||||
END;
|
||||
RETURN TRUE;
|
||||
END createBuildDir;
|
||||
|
||||
PROCEDURE buildDependencies(VAR projectFile: ARRAY OF CHAR);
|
||||
BEGIN
|
||||
(* For now, skip dependency building in local mode *)
|
||||
(* This can be implemented later when the infrastructure is ready *)
|
||||
Out.String("Dependency building for local projects not yet implemented."); Out.Ln;
|
||||
Out.String("Please build dependencies manually using 'vipak -p <package>'"); Out.Ln;
|
||||
END buildDependencies;
|
||||
|
||||
PROCEDURE buildProject(VAR projectFile: ARRAY OF CHAR; info: ProjectInfo): BOOLEAN;
|
||||
VAR
|
||||
keys, values: StringList.TStringList;
|
||||
k, v: StringList.pstring;
|
||||
b: BOOLEAN;
|
||||
cmd: ARRAY 256 OF CHAR;
|
||||
res, i: INTEGER;
|
||||
buildDirVar: ARRAY 64 OF CHAR;
|
||||
BEGIN
|
||||
(* Get build information using local file reader *)
|
||||
b := getBuildInfoFromLocalFile(projectFile, keys, values);
|
||||
|
||||
IF b & (keys # NIL) & (values # NIL) THEN
|
||||
Out.String("Building project: "); Out.String(info.name); Out.Ln;
|
||||
|
||||
(* Change to build directory *)
|
||||
COPY(DefaultBuildDir, buildDirVar);
|
||||
res := Platform.Chdir(buildDirVar);
|
||||
IF res # 0 THEN
|
||||
Out.String("Failed to change to build directory"); Out.Ln;
|
||||
RETURN FALSE;
|
||||
END;
|
||||
|
||||
(* Execute build commands *)
|
||||
i := 0;
|
||||
REPEAT
|
||||
k := keys.GetString(keys, i);
|
||||
v := values.GetString(values, i);
|
||||
|
||||
(* Create command: copy from parent directory if needed *)
|
||||
COPY(k^, cmd);
|
||||
Strings.Append(" ../", cmd);
|
||||
Strings.Append(v^, cmd);
|
||||
|
||||
Out.String("Executing: "); Out.String(cmd); Out.Ln;
|
||||
res := Platform.System(cmd);
|
||||
IF res # 0 THEN
|
||||
Out.String("Build command failed with code: "); Out.Int(res, 0); Out.Ln;
|
||||
COPY("..", buildDirVar);
|
||||
res := Platform.Chdir(buildDirVar);
|
||||
RETURN FALSE;
|
||||
END;
|
||||
INC(i);
|
||||
UNTIL i = keys.Count;
|
||||
|
||||
(* Restore original directory *)
|
||||
COPY("..", buildDirVar);
|
||||
res := Platform.Chdir(buildDirVar);
|
||||
Out.String("Build completed successfully!"); Out.Ln;
|
||||
RETURN TRUE;
|
||||
ELSE
|
||||
Out.String("No build information found in project file."); Out.Ln;
|
||||
RETURN FALSE;
|
||||
END;
|
||||
END buildProject;
|
||||
|
||||
PROCEDURE buildLocal*(VAR projectFile: ARRAY OF CHAR; withDeps: BOOLEAN);
|
||||
VAR
|
||||
info: ProjectInfo;
|
||||
b: BOOLEAN;
|
||||
BEGIN
|
||||
(* Check if project file exists *)
|
||||
IF ~fileExists(projectFile) THEN
|
||||
Out.String("Project file not found: "); Out.String(projectFile); Out.Ln;
|
||||
Out.String("Create one with 'vipak --init'"); Out.Ln;
|
||||
HALT(1);
|
||||
END;
|
||||
|
||||
(* Parse project file *)
|
||||
b := parseProjectFile(projectFile, info);
|
||||
IF ~b THEN
|
||||
Out.String("Failed to parse project file: "); Out.String(projectFile); Out.Ln;
|
||||
HALT(1);
|
||||
END;
|
||||
|
||||
Out.String("Building project: "); Out.String(info.name);
|
||||
Out.String(" v"); Out.String(info.version); Out.Ln;
|
||||
|
||||
(* Create build directory *)
|
||||
IF ~createBuildDir() THEN
|
||||
HALT(1);
|
||||
END;
|
||||
|
||||
(* Build dependencies if requested and available *)
|
||||
IF withDeps & info.hasDeps THEN
|
||||
buildDependencies(projectFile);
|
||||
END;
|
||||
|
||||
(* Build the project itself *)
|
||||
IF info.hasBuild THEN
|
||||
b := buildProject(projectFile, info);
|
||||
IF ~b THEN
|
||||
HALT(1);
|
||||
END;
|
||||
ELSE
|
||||
Out.String("No build instructions found in project file."); Out.Ln;
|
||||
END;
|
||||
END buildLocal;
|
||||
|
||||
PROCEDURE init*;
|
||||
VAR
|
||||
projectFile: ARRAY 64 OF CHAR;
|
||||
projectName: ARRAY 64 OF CHAR;
|
||||
BEGIN
|
||||
COPY(DefaultProjectFile, projectFile);
|
||||
IF fileExists(projectFile) THEN
|
||||
Out.String("Project file already exists: "); Out.String(projectFile); Out.Ln;
|
||||
HALT(1);
|
||||
END;
|
||||
|
||||
COPY("myproject", projectName);
|
||||
createDefaultProject(projectFile);
|
||||
createTemplateModule(projectName);
|
||||
|
||||
Out.Ln;
|
||||
Out.String("Project initialized! You can now:"); Out.Ln;
|
||||
Out.String(" 1. Edit src/"); Out.String(projectName); Out.String(".Mod with your code"); Out.Ln;
|
||||
Out.String(" 2. Edit "); Out.String(projectFile); Out.String(" to configure build settings"); Out.Ln;
|
||||
Out.String(" 3. Run 'vipak --local' to build the project"); Out.Ln;
|
||||
END init;
|
||||
|
||||
BEGIN
|
||||
eol[0] := 0AX; eol[1] := 0X; (* Unix line ending *)
|
||||
END vpkLocalBuilder.
|
||||
Loading…
Add table
Add a link
Reference in a new issue