diff --git a/diaspora2hugo b/diaspora2hugo index 3fb4cbd..abe322f 160000 --- a/diaspora2hugo +++ b/diaspora2hugo @@ -1 +1 @@ -Subproject commit 3fb4cbd410309ff341510171bdd6f154e767c01b +Subproject commit abe322f45bff05b42da71271186a623d5e511428 diff --git a/logger.Mod b/logger.Mod deleted file mode 100644 index 3966c0b..0000000 --- a/logger.Mod +++ /dev/null @@ -1,82 +0,0 @@ -MODULE Logger; -IMPORT time, Out, Strings; - -CONST - deca = 10; - -PROCEDURE GetDecas(number: LONGINT): LONGINT; -VAR - i: LONGINT; -BEGIN - i := 1; - - WHILE number > deca DO - number := number DIV deca; - INC(i); - END; - - RETURN i; -END GetDecas; - -PROCEDURE LogInt*(number: LONGINT); -BEGIN - Out.Int(number, GetDecas(number)); -END LogInt; - -PROCEDURE LogIntLn*(number: LONGINT); -BEGIN - LogInt(number); - Out.Ln(); -END LogIntLn; - -PROCEDURE LogNormalized*(number, normal: LONGINT); -VAR - decimals, i: LONGINT; -BEGIN - i:=0; - decimals := GetDecas(number); - WHILE decimals + i < normal DO - INC(i); - Out.Int(0, 1) - END; - - LogInt(number); -END LogNormalized; - -PROCEDURE Log*(buff: ARRAY OF CHAR); -VAR - year, month, day, hour, min, sec, i: LONGINT; -BEGIN - time.Now(year, month, day, hour, min, sec); - - LogNormalized(year, 4); - Out.String("/"); - LogNormalized(month, 2); - Out.String("/"); - LogNormalized(day, 2); - Out.String(" "); - LogNormalized(hour, 2); - Out.String("-"); - LogNormalized(min, 2); - Out.String("-"); - LogNormalized(sec, 2); - Out.String(" :- "); - FOR i := 0 TO Strings.Length(buff) - 1 DO - (* Out.Char(" "); - Out.Int(ORD(buff[i]), 4); - Out.Char("-"); *) - Out.Char(buff[i]); - (* Out.Char(" ");Out.Char(" ");Out.Char(" "); *) - END; - Out.Ln; -END Log; - -PROCEDURE Char*(char: CHAR); -VAR - string :ARRAY 1 OF CHAR; -BEGIN - string[0] :=char; - Log(string); -END Char; - -END Logger. \ No newline at end of file diff --git a/makefile b/makefile index 4985e2b..37822ed 100644 --- a/makefile +++ b/makefile @@ -1,12 +1,14 @@ VOC = voc VERSION_FILE = ./VersionFile.json +BUILDDIR = build + test: clean create_builds_dir all copy-version-file-to-build-dir run create_builds_dir: - mkdir ./builds + mkdir -p $(BUILDDIR) copy-version-file-to-build-dir: @@ -60,7 +62,7 @@ json: ../vpkJsonParser.Mod clean: - rm -r builds & + if [ -d "$(BUILDDIR)" ]; then rm -rf $(BUILDDIR); fi run-http-server: