changeset 81:a873ccf6d4cd

elvish
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 23 Jun 2025 03:45:13 -0600
parents b0efa2236f11
children 43e07db3736b
files build.elv dev.elv
diffstat 2 files changed, 43 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
diff -r b0efa2236f11 -r a873ccf6d4cd build.elv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build.elv	Mon Jun 23 03:45:13 2025 -0600
@@ -0,0 +1,36 @@
+#!/usr/bin/env elvish
+
+cd (dirname (src)[name])
+
+var LUAN = (bash -c 'source luan string:; echo $LUAN')
+
+rm -rf build
+mkdir -p build/luan_editor/jars
+cp $LUAN/jars/luan.jar build/luan_editor/jars
+cp $LUAN/jars/miglayout-*.jar build/luan_editor/jars
+cp $LUAN/jars/flatlaf-*.jar build/luan_editor/jars
+cp lib/*.jar build/luan_editor/jars
+
+cd src
+set E:CLASSPATH = .
+for file [../build/luan_editor/jars/*] {
+	set E:CLASSPATH = $E:CLASSPATH":"$file
+}
+javac **.java
+jar cvf ../build/luan_editor/jars/luan_editor.jar **.class **.luan
+cd ..
+
+cp -r dictionaries build/luan_editor
+
+cp scripts/luan_editor.sh build/luan_editor
+cp scripts/install.sh build/luan_editor
+cp scripts/uninstall.sh build/luan_editor
+hg identify >build/luan_editor/hg_rev.txt
+
+cd build
+
+tar -cf ../website/src/download/luan_editor.tar luan_editor
+
+luan_editor/install.sh
+
+echo "finished build"
diff -r b0efa2236f11 -r a873ccf6d4cd dev.elv
--- a/dev.elv	Sat Jun 21 23:36:34 2025 -0600
+++ b/dev.elv	Mon Jun 23 03:45:13 2025 -0600
@@ -4,17 +4,18 @@
 
 var DICTIONARIES = $EDITOR_HOME/dictionaries/
 
-var CLASSPATH = (bash -c 'source luan string:; echo $CLASSPATH')
-set CLASSPATH = $CLASSPATH":"$EDITOR_HOME/lib/jortho.jar:$EDITOR_HOME/src
+set E:CLASSPATH = $E:CLASSPATH":"$EDITOR_HOME/lib/jortho.jar:$EDITOR_HOME/src
 
 mkdir -p ~/.luan_editor
 
-#set +m
-
 var my_grep = {|@a|
 	try {
 		grep $@a
-	} catch e { }
+	} catch e {
+		if (not (eq $e[reason][exit-status] 1) ) {
+			fail $e
+		}
+	}
 }
 
-java -Dport=56588 -Ddictionaries=$DICTIONARIES -Xdock:name="Luan Editor dev" -classpath $CLASSPATH luan.Luan classpath:luan_editor/editor.luan (all $args) 2>&1 | $my_grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee err
+java -Dport=56588 -Ddictionaries=$DICTIONARIES -Xdock:name="Luan Editor dev" luan.Luan classpath:luan_editor/editor.luan (all $args) 2>&1 | $my_grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee err