Compiling apps with java 17

luwrain · Apr 28, 2024 · fee904f · fee904f
1 parent 69fe72f
commit fee904f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/scripts/config.sh b/scripts/config.sh
@@ -8,3 +8,4 @@ APPS='commander contacts mail news notepad telegram viewer vk'
 LANGS='en ru'
 EXTENSIONS='cmdtts emacspeak mssapi plmp3 rhvoice speechd voiceman'
 SRC_DEST_DIR=/tmp/luwrain-src
+JAVA_VERSION=17
diff --git a/scripts/lwr-ant-gen-app b/scripts/lwr-ant-gen-app
@@ -26,7 +26,7 @@ cat <<EOF
  <target name="compile" depends="clean">
  <mkdir dir="build"/>
  <mkdir dir="build/main"/>
- <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" debug="true" debuglevel="lines,vars,source">
+ <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" source="$JAVA_VERSION" target="$JAVA_VERSION" debug="true" debuglevel="lines,vars,source">
  <classpath refid="classpath"/>
  <compilerarg value="-Xlint:unchecked" />
  <compilerarg value="-Xlint:deprecation" />

diff --git a/scripts/lwr-ant-gen-ext b/scripts/lwr-ant-gen-ext
@@ -26,7 +26,7 @@ cat <<EOF
  <target name="compile" depends="clean">
  <mkdir dir="build"/>
  <mkdir dir="build/main"/>
- <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" debug="true" debuglevel="lines,vars,source">
+ <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" source="$JAVA_VERSION" target="$JAVA_VERSION" debug="true" debuglevel="lines,vars,source">
  <classpath refid="classpath"/>
  <compilerarg value="-Xlint:unchecked" />
  <compilerarg value="-Xlint:deprecation" />

diff --git a/scripts/lwr-ant-gen-lang b/scripts/lwr-ant-gen-lang
@@ -35,7 +35,7 @@ cat <<EOF
  <target name="compile" depends="clean">
  <mkdir dir="build"/>
  <mkdir dir="build/main"/>
- <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" debug="true" debuglevel="lines,vars,source">
+ <javac includeantruntime="false" encoding="UTF-8" srcdir="src/main/java" destdir="build/main" source="$JAVA_VERSION" target="$JAVA_VERSION" debug="true" debuglevel="lines,vars,source">
  <classpath refid="classpath"/>
  <compilerarg value="-Xlint:unchecked" />
  <compilerarg value="-Xlint:deprecation" />

diff --git a/sounds/list-item-important.sh b/sounds/list-item-important.sh
@@ -3,24 +3,19 @@
 # The LUWRAIN Project, GPL v.3
 # As major
 
-sox -D -n -b 32 -r 44100 -c 2 01.wav \
- synth 1 sin %-6 sin %6 sin fmod %-6 \
- fade l 0 0.5 0.5
+INS=46
+DUR=30
 
-sox -D -n -b 32 -r 44100 -c 2 02.wav \
- synth 1 sin %-13 sin %-1 sin fmod %-13 \
- fade l 0 0.5 0.5 pad 0.05
+./melody.sh $INS 120 75 $DUR 80 $DUR 84 $DUR | csvmidi - > melody.midi
+timidity -Ow melody.midi > /dev/null
+mv melody.wav .melody-src.wav
+sox -D .melody-src.wav -r 48000 -c 1 -b 16 .melody1.wav treble -5
+sox -D .melody1.wav -c 2 .melody.wav
 
-sox -D -n -b 32 -r 44100 -c 2 03.wav \
- synth 1 sin %-9 sin %3 sin fmod %-9 \
- fade l 0 0.5 0.5 pad 0.1
+sox -D -n -r 48000 -b 16 -c 2 .harm.wav \
+ synth 10 sin %-13 sin %-9 sin %-6 \
+ fade t 0.5 3 2 gain -25
 
-sox -D -n -b 32 -r 44100 -c 2 04.wav \
- synth 1 pl %-18 pl %-6 pl %6 sin fmod %6 \
- fade q 0 1 1 gain -25
-
-sox -D 01.wav 02.wav 03.wav 04.wav -m 05.wav
-sox -D 05.wav 06.wav pad 0 1
-sox 06.wav 07.wav reverb 75 50 50 50 10 3
-sox -D --norm=-0.5 07.wav list-item-important.wav
-rm -f 0?.wav
+sox -D .melody.wav .harm.wav -m .pre.wav
+sox -D --norm=-0.1 .pre.wav list-item-important.wav pad 0 0.5 reverb 65 fade t 0 3 3
+rm -f *.midi .*.wav
diff --git a/sounds/make b/sounds/make
@@ -53,7 +53,7 @@ sox -D .empty-line.wav empty-line.wav gain -30
 
 ./list-item-important.sh
 mv list-item-important.wav _list-item-important.wav
-sox -D _list-item-important.wav list-item-important.wav gain -20
+sox -D _list-item-important.wav list-item-important.wav gain -28
 
 ./bounds.sh
 mv bounds.wav _bounds.wav