Mercurial Hosting > editor
changeset 71:99ebb6176d2f default tip
better build
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 12 Jun 2025 17:08:31 -0600 (18 hours ago) |
| parents | f4e393a13d59 |
| children | |
| files | build.sh dev.sh scripts/install.sh scripts/luan_editor.sh src/luan_editor/Java.luan src/luan_editor/Spell_checker.luan |
| diffstat | 6 files changed, 33 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/build.sh Tue Jun 10 22:34:24 2025 -0600 +++ b/build.sh Thu Jun 12 17:08:31 2025 -0600 @@ -20,6 +20,7 @@ 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
--- a/dev.sh Tue Jun 10 22:34:24 2025 -0600 +++ b/dev.sh Thu Jun 12 17:08:31 2025 -0600 @@ -3,7 +3,7 @@ EDITOR_HOME=`dirname $0` -export DICTIONARIES=$EDITOR_HOME/dictionaries/ +DICTIONARIES="$EDITOR_HOME/dictionaries/" . luan string: CLASSPATH=$CLASSPATH:$EDITOR_HOME/lib/jortho.jar:$EDITOR_HOME/src @@ -12,4 +12,4 @@ set +m -java -Dport=56588 -Xdock:name="Luan Editor dev" -classpath $CLASSPATH luan.Luan classpath:luan_editor/editor.luan "$@" 2>&1 | grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee err +java -Dport=56588 -Ddictionaries="$DICTIONARIES" -Xdock:name="Luan Editor dev" -classpath $CLASSPATH luan.Luan classpath:luan_editor/editor.luan "$@" 2>&1 | grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee err
--- a/scripts/install.sh Tue Jun 10 22:34:24 2025 -0600 +++ b/scripts/install.sh Thu Jun 12 17:08:31 2025 -0600 @@ -7,45 +7,10 @@ cat >/usr/local/bin/luan_editor <<End #!/bin/bash -set -e -export DICTIONARIES="$(pwd)/dictionaries/" - -for i in "$(pwd)"/jars/* ; do CLASSPATH="\$CLASSPATH:\$i" ; done -CLASSPATH="\$(echo -n "\$CLASSPATH" | sed 's/^://')" - -mkdir -p ~/.luan_editor - -set +m +"$(pwd)/luan_editor.sh" "\$@" End -if [[ "$(uname)" == "Darwin" ]]; then - -cat >>/usr/local/bin/luan_editor <<End - -function runJava() { - java -Xdock:name="Luan Editor" -Duser.home="\$HOME" -classpath "\$CLASSPATH" luan.Luan classpath:luan_editor/editor.luan "\$@" 2>&1 | grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee ~/.luan_editor/error.log & -} - -if [[ \$# == 0 ]]; then - runJava -else - for file in "\$@"; do - runJava "\$file" - sleep 0.1 - done -fi -End - -else - -cat >>/usr/local/bin/luan_editor <<End - -java -Duser.home="\$HOME" -classpath "\$CLASSPATH" luan.Luan classpath:luan_editor/editor.luan "\$@" 2>&1 | tee ~/.luan_editor/error.log & -End - -fi - chmod +x /usr/local/bin/luan_editor echo "The command 'luan_editor' has been installed"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/luan_editor.sh Thu Jun 12 17:08:31 2025 -0600 @@ -0,0 +1,27 @@ +#!/bin/bash +set -e + +DICTIONARIES="/Users/fschmidt/hg/editor/build/luan_editor/dictionaries/" + +for i in "/Users/fschmidt/hg/editor/build/luan_editor"/jars/* ; do CLASSPATH="$CLASSPATH:$i" ; done +CLASSPATH="$(echo -n "$CLASSPATH" | sed 's/^://')" + +mkdir -p ~/.luan_editor + +set +m + +if [[ "$(uname)" == "Darwin" ]]; then # Mac crap + function runJava() { + java -Ddictionaries="$DICTIONARIES" -Xdock:name="Luan Editor" -Duser.home="$HOME" -classpath "$CLASSPATH" luan.Luan classpath:luan_editor/editor.luan "$@" 2>&1 | grep --line-buffered -v 'NSRemoteView\|NSSavePanel' | tee ~/.luan_editor/error.log & + } + if [[ $# == 0 ]]; then + runJava + else + for file in "$@"; do + runJava "$file" + sleep 0.1 + done + fi +else + java -Duser.home="$HOME" -Ddictionaries="$DICTIONARIES" -classpath "$CLASSPATH" luan.Luan classpath:luan_editor/editor.luan "$@" 2>&1 | tee ~/.luan_editor/error.log & +fi
--- a/src/luan_editor/Java.luan Tue Jun 10 22:34:24 2025 -0600 +++ b/src/luan_editor/Java.luan Thu Jun 12 17:08:31 2025 -0600 @@ -6,7 +6,7 @@ local Java = {} -Java.home_dir = System.getProperty("user.home") +Java.home_dir = System.getProperty("user.home") or error() Java.port = System.getProperty("port")
--- a/src/luan_editor/Spell_checker.luan Tue Jun 10 22:34:24 2025 -0600 +++ b/src/luan_editor/Spell_checker.luan Thu Jun 12 17:08:31 2025 -0600 @@ -7,7 +7,7 @@ local Spell_checker = {} -local dir = System.getenv("DICTIONARIES") or error() +local dir = System.getProperty("dictionaries") or error() SpellCheckerLuan.registerDictionaries( "file:"..dir, "en" ) function Spell_checker.spell_check(text_component,spell_check)