From 58acea7969b4026dccaf354d33d557e595829a1c Mon Sep 17 00:00:00 2001 From: MineRobber9000 Date: Tue, 29 Oct 2024 12:58:56 -0400 Subject: [PATCH 1/2] Make symlinks relative Making the symlinks relative allows for anyone to benefit from them (both Joe and anyone else) as opposed to just Joe. Simply clone JoeStrout/minimicro-sysdisk and JoeStrout/miniscript into the same directory, and it should Just Work(tm). --- MiniScript-cpp/lib/dateTime.ms | 2 +- MiniScript-cpp/lib/grfon.ms | 2 +- MiniScript-cpp/lib/importUtil.ms | 2 +- MiniScript-cpp/lib/json.ms | 2 +- MiniScript-cpp/lib/listUtil.ms | 2 +- MiniScript-cpp/lib/mapUtil.ms | 2 +- MiniScript-cpp/lib/mathUtil.ms | 2 +- MiniScript-cpp/lib/matrixUtil.ms | 2 +- MiniScript-cpp/lib/qa.ms | 2 +- MiniScript-cpp/lib/stringUtil.ms | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MiniScript-cpp/lib/dateTime.ms b/MiniScript-cpp/lib/dateTime.ms index 4a25b5e..1fb22e5 120000 --- a/MiniScript-cpp/lib/dateTime.ms +++ b/MiniScript-cpp/lib/dateTime.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/dateTime.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/dateTime.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/grfon.ms b/MiniScript-cpp/lib/grfon.ms index b783b14..61581a9 120000 --- a/MiniScript-cpp/lib/grfon.ms +++ b/MiniScript-cpp/lib/grfon.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/grfon.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/grfon.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/importUtil.ms b/MiniScript-cpp/lib/importUtil.ms index 93f6772..320e414 120000 --- a/MiniScript-cpp/lib/importUtil.ms +++ b/MiniScript-cpp/lib/importUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/importUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/importUtil.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/json.ms b/MiniScript-cpp/lib/json.ms index 898752e..c13fd44 120000 --- a/MiniScript-cpp/lib/json.ms +++ b/MiniScript-cpp/lib/json.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/json.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/json.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/listUtil.ms b/MiniScript-cpp/lib/listUtil.ms index e3c11ed..38a1e85 120000 --- a/MiniScript-cpp/lib/listUtil.ms +++ b/MiniScript-cpp/lib/listUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/listUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/listUtil.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/mapUtil.ms b/MiniScript-cpp/lib/mapUtil.ms index 399a13a..82c7e98 120000 --- a/MiniScript-cpp/lib/mapUtil.ms +++ b/MiniScript-cpp/lib/mapUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/mapUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/mapUtil.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/mathUtil.ms b/MiniScript-cpp/lib/mathUtil.ms index c82aef8..7941a8d 120000 --- a/MiniScript-cpp/lib/mathUtil.ms +++ b/MiniScript-cpp/lib/mathUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/mathUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/mathUtil.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/matrixUtil.ms b/MiniScript-cpp/lib/matrixUtil.ms index 829212e..bcf89af 120000 --- a/MiniScript-cpp/lib/matrixUtil.ms +++ b/MiniScript-cpp/lib/matrixUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/matrixUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/matrixUtil.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/qa.ms b/MiniScript-cpp/lib/qa.ms index 2ae59bd..0b7eced 120000 --- a/MiniScript-cpp/lib/qa.ms +++ b/MiniScript-cpp/lib/qa.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/qa.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/qa.ms \ No newline at end of file diff --git a/MiniScript-cpp/lib/stringUtil.ms b/MiniScript-cpp/lib/stringUtil.ms index 8c4be99..c648a7b 120000 --- a/MiniScript-cpp/lib/stringUtil.ms +++ b/MiniScript-cpp/lib/stringUtil.ms @@ -1 +1 @@ -/Users/jstrout/svnrepo/minimicro-sysdisk/sys/lib/stringUtil.ms \ No newline at end of file +../../../minimicro-sysdisk/sys/lib/stringUtil.ms \ No newline at end of file From ccb1c4f366b200abc0133d85c8d8c05149d51862 Mon Sep 17 00:00:00 2001 From: MineRobber9000 Date: Tue, 29 Oct 2024 13:18:20 -0400 Subject: [PATCH 2/2] Update README with symlink instructions --- MiniScript-cpp/README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MiniScript-cpp/README.md b/MiniScript-cpp/README.md index 53dee52..d84c5fb 100644 --- a/MiniScript-cpp/README.md +++ b/MiniScript-cpp/README.md @@ -6,13 +6,15 @@ This folder contains the source code of the C++ implementation of the [MiniScrip MiniScript is built with [CMake](https://cmake.org/). You can generate your desired flavour of build files as usual from either the CMake GUI or using `cmake` on the command line. If you are unfamiliar with CMake and want to build right now, use the GUI, or follow the command-line steps below. -1. Create a directory in this (MiniScript-cpp) folder called `build`. (Don't worry, it will be ignored by git.) +1. Clone [minimicro-sysdisk](https://github.com/JoeStrout/minimicro-sysdisk) in the same directory as this repository (so minimicro-sysdisk and miniscript should be folders next to each other, with this directory (MiniScript-cpp) in miniscript). We use a lot of the same libraries as Mini Micro, so having both of them next to each other lets us avoid having 2 copies of the same library. -2. `cd build` to change to that build directory. +2. Create a directory in this (MiniScript-cpp) folder called `build`. (Don't worry, it will be ignored by git.) -3. `cmake ../..` (or on Windows, `cmake ..\..`) to generate a makefile and related files in the build directory. +3. `cd build` to change to that build directory. -4. `cmake --build . --config Release` to actually do the build. +4. `cmake ../..` (or on Windows, `cmake ..\..`) to generate a makefile and related files in the build directory. + +5. `cmake --build . --config Release` to actually do the build. If successful, you should find an executable called `miniscript` (or `miniscript.exe` on Windows) which you can install (see **Installation**, below). You'll also find a shared library (libminiscript-cpp.a, miniscript-cpp.lib, or similar) for you to link to in your own projects if you like. You can even `include()` the CMakeLists.txt of this project inside your own for clean dependency management.