From e871e5b1b5b85abd687f1108f062d805c182749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Tue, 5 Mar 2024 15:30:53 +0000 Subject: [PATCH] Compiladores: More fixes for binaries --- 2ano2/Compiladores/antlr4-bin/antlr4-build | 2 +- 2ano2/Compiladores/flake.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2ano2/Compiladores/antlr4-bin/antlr4-build b/2ano2/Compiladores/antlr4-bin/antlr4-build index 26b21fe..7f9d123 100755 --- a/2ano2/Compiladores/antlr4-bin/antlr4-build +++ b/2ano2/Compiladores/antlr4-bin/antlr4-build @@ -39,7 +39,7 @@ function process() fi case $target in java) - (cd `dirname $g`; if ( grep Visitor *java &> /dev/null ); then opt="-visitor"; else opt=""; fi; antlr4 $opt `basename $g`*.g4) && javac ./`dirname $g`/*.java + (cd `dirname $g`; if ( grep Visitor *java &> /dev/null ); then opt="-visitor"; else opt=""; fi; antlr4 $opt `basename $g`*.g4) && antlr4-javac ./`dirname $g`/*.java ;; cpp) (cd `dirname $g`; make) diff --git a/2ano2/Compiladores/flake.nix b/2ano2/Compiladores/flake.nix index d87d574..cc4f439 100644 --- a/2ano2/Compiladores/flake.nix +++ b/2ano2/Compiladores/flake.nix @@ -25,7 +25,7 @@ installPhase = '' set -eu mkdir -p $out/share/java - cp ${src} $out/share/java + cp ${src} $out/share/java/ST-${version}.jar ''; };