Skip to content

Commit

Permalink
slight changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gfngfn committed Dec 27, 2023
1 parent 193416a commit a7c5a20
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ obsolete/*.txt
old/
*.png
satysfi
saphe
*.ttf
*.otf
*.ttc
Expand Down
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PREFIX=/usr/local
LIBDIR=$(PREFIX)/share/satysfi
TARGET=satysfi
SATYSFI=satysfi
SAPHE=saphe
BINDIR=$(PREFIX)/bin
RM=rm -f
DUNE=dune
Expand All @@ -9,25 +10,29 @@ DUNE=dune

all:
$(DUNE) build --root .
cp _build/install/default/bin/$(TARGET) .
cp _build/install/default/bin/$(SATYSFI) .
cp _build/install/default/bin/$(SAPHE) .

test:
$(DUNE) runtest

test-packages:
./check-packages.sh

install: $(TARGET)
install: $(SATYSFI)
mkdir -p $(BINDIR)
install $(TARGET) $(BINDIR)
install $(SATYSFI) $(BINDIR)
install $(SAPHE) $(BINDIR)

#preliminary:
# [ -d .git ] && git submodule update -i || echo "Skip git submodule update -i"

uninstall:
rm -rf $(BINDIR)/$(TARGET)
rm -rf $(BINDIR)/$(SATYSFI)
rm -rf $(BINDIR)/$(SAPHE)
rm -rf $(LIBDIR)

clean:
$(DUNE) clean
$(RM) satysfi
$(RM) $(SATYSFI)
$(RM) $(SAPHE)
5 changes: 3 additions & 2 deletions bin-saphe/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ exception ConfigError of config_error


let version =
"Saphe version 0.0.1 alpha"
Printf.sprintf "Saphe version %s alpha"
(SemanticVersion.to_string Constant.current_ecosystem_version)


type line =
Expand Down Expand Up @@ -486,7 +487,7 @@ let solve ~(fpath_in : string) =
let solve_input =
let abspathstr_in = get_abs_path_string abspath_in in
if Sys.is_directory abspathstr_in then
(* If the input is a package directory: *)
(* If the input is a directory that forms a package: *)
let abspath_lock_config = make_package_lock_config_path abspathstr_in in
PackageSolveInput{
root = abspath_in;
Expand Down

0 comments on commit a7c5a20

Please sign in to comment.