diff --git a/GNUmakefile b/GNUmakefile index 3d2af91..0483499 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ build_deps: @echo "________________________________________" buildThis: - @echo "building vipack" + @echo "building vipak" cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkTools.Mod cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkSettings.Mod cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/unix/vpkTime.Mod @@ -67,8 +67,8 @@ buildThis: cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkResolver.Mod cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkJsonDepRetriever.Mod cd $(BUILD) && $(VOC) -s $(mkfile_dir_path)/src/vpkInstaller.Mod - cd $(BUILD) && $(VOC) $(mkfile_dir_path)/src/vipack.Mod -cm - cd $(BUILD) && gcc -o vipack *.o -static -L/opt/voc/lib -lvoc-O2 /opt/voc/lib/libvoc-O2.a -L. -lmbedtls -lmbedcrypto -lmbedx509 libmbedcrypto.a libmbedtls.a libmbedx509.a + cd $(BUILD) && $(VOC) $(mkfile_dir_path)/src/vipak.Mod -cm + cd $(BUILD) && gcc -o vipak *.o -static -L/opt/voc/lib -lvoc-O2 /opt/voc/lib/libvoc-O2.a -L. -lmbedtls -lmbedcrypto -lmbedx509 libmbedcrypto.a libmbedtls.a libmbedx509.a @echo "________________________________________" tests: diff --git a/readme.md b/readme.md index 6ce237b..edd65a0 100644 --- a/readme.md +++ b/readme.md @@ -1,11 +1,11 @@ ![](https://xn--y9azesw6bu.xn--y9a3aq/media/uploads/2022/01/19/4b650ab4-2e97-45f8-8fd3-af1c726399c0.png) -vipack +vipak ====== -vipack is a language or dependency agnostic package manager. +vipak is a language or dependency agnostic package manager. -currently it has a backend to retrieve dependencies from the [vipack tree](https://github.com/vishaps/vipackTree). +currently it has a backend to retrieve dependencies from the [vipak tree](https://codeberg.org/vishapoberon/vipatsar). that is a list of json files, each containing information about the package dependencies, where to download the packages, and how to build those. @@ -14,8 +14,8 @@ build requirements: git, gmake, cc, voc -`git clone https://github.com/vishaps/vipack` -`cd vipack` +`git clone https://codeberg.org/vishapoberon/vipak` +`cd vipak` `gmake` or on freebsd: @@ -25,23 +25,23 @@ or on freebsd: usage ===== -try `vipack --help`. +try `vipak --help`. some examples: -`vipack -s` — syncs the default package tree to `~/.vipack/vipackTree`. +`vipak -s` — syncs the default package tree to `~/.vipak/vipatsar`. -`vipack -d -p irc_bot` — only resolves/shows dependencies of the package `irc_bot`, does not download or build packages. +`vipak -d -p irc_bot` — only resolves/shows dependencies of the package `irc_bot`, does not download or build packages. -`vipack -f -p irc_bot` — resolves and fetches required packages. +`vipak -f -p irc_bot` — resolves and fetches required packages. -`vipack -p irc_bot` — will build the package and dependencies in the default prefix: `~/vpkLocal` +`vipak -p irc_bot` — will build the package and dependencies in the default prefix: `~/vpkLocal` -`vipack -a -p irc_bot` — ask for confirmation before building the package and dependencies in the default prefix: `~/vpkLocal` +`vipak -a -p irc_bot` — ask for confirmation before building the package and dependencies in the default prefix: `~/vpkLocal` -`vipack -p irc_bot -P /tmp/coolprefix` — will do the same in the custom prefix. +`vipak -p irc_bot -P /tmp/coolprefix` — will do the same in the custom prefix. -`vipack -p irc_bot -P /tmp/coolprefix -t /tmp/myothertree` — the same, but the dependency resolution will be conducted by using custom package description tree. +`vipak -p irc_bot -P /tmp/coolprefix -t /tmp/myothertree` — the same, but the dependency resolution will be conducted by using custom package description tree. todo ==== diff --git a/src/vipack.Mod b/src/vipak.Mod similarity index 98% rename from src/vipack.Mod rename to src/vipak.Mod index 2017933..09eccc9 100644 --- a/src/vipack.Mod +++ b/src/vipak.Mod @@ -1,4 +1,4 @@ -MODULE vipack; +MODULE vipak; IMPORT Texts, Strings, Oberon, Out, vpkConf, vpkLogger, vpkSyncer, vpkInstaller, vpkdepTree, opts, StringList; (* @@ -230,7 +230,7 @@ BEGIN vpkLogger.Log("HelpText"); Out.String("Vipack sync - syncing git tree and local tree"); Out.Ln; Out.String("vipackConf.json path -> $HOME/.vipack/vipackConf.json"); Out.Ln; - Out.String("vipackTree path -> $HOME/.vipack/vipackTree") + Out.String("vipak tree path -> $HOME/.vipak/vipatsar") END help; PROCEDURE main(); @@ -268,4 +268,4 @@ END main; BEGIN main -END vipack. +END vipak. diff --git a/src/vpkSettings.Mod b/src/vpkSettings.Mod index c2c530b..7cdd96e 100644 --- a/src/vpkSettings.Mod +++ b/src/vpkSettings.Mod @@ -28,9 +28,9 @@ TYPE END; BEGIN - vpkConfDir := ".vipack"; - vpkConfFile := "vipackConf.json"; - vpkTreeDir := "vipackTree"; + vpkConfDir := ".vipak"; + vpkConfFile := "vipak.json"; + vpkTreeDir := "vipatsar"; vpkPkgDir := "vpkLocal"; vpkDepDir := "deps"; vpkBldDir := "build"; @@ -58,8 +58,8 @@ BEGIN bldType := "Build"; bldCommand := "Command"; bldFile := "File"; - defTreeVal := "https://github.com/vishaps/vipackTree"; - (*defTreeVal := "git@github.com:vishaps/vipackTree";*) + defTreeVal := "https://codeberg.org/vishapoberon/vipatsar"; + (*defTreeVal := "git@codeberg.org:vishapoberon/vipatsar";*) confTreeVal := defTreeVal; defTypVal := rmtTypGitVal;