• R/O
  • SSH
  • HTTPS

acerola3d: Commit


Commit MetaInfo

Revision1171 (tree)
Time2019-01-17 03:16:38
Authorksaito0717

Log Message

fix.

Change Summary

Incremental Difference

--- trunk/acerola3d/CHANGES.txt (revision 1170)
+++ trunk/acerola3d/CHANGES.txt (revision 1171)
@@ -1,5 +1,32 @@
11 title: Acerola3D ChangeLog
22
3+2019,01/17
4+========================================
5+
6+やっぱりJogAmpの2.3.2はfatバージョンでも
7+ダメだった。起動に1分ぐらいかかってしまう。
8+Windowsで管理者権限の無いユーザーで実行
9+してる時だけの問題なのかもしれない。
10+
11+* <http://forum.jogamp.org/Java-3D-initialization-is-super-slow-td4037070.html>
12+
13+ということで,プラットフォームごとに
14+分けてネイティブライブラリを展開して置く
15+形に変更してみる。加えてlinuxはamd64のみ
16+とし,他のアーキテクチャは入れないことに
17+した。
18+
19+2018,12/24
20+========================================
21+
22+Java11に対応させるための変更を行った。
23+それに加えてライブラリにJAXB,JAFのライブラリも
24+追加している。あと以前試した時には
25+JogAmp2.3.2は起動が遅くなってダメだった
26+のだけど,jarファイルを1つにまとめた
27+fatというバージョンが存在していたので,
28+これを使ってみることにする。
29+
330 2018,05/05
431 ========================================
532
--- trunk/acerola3d/build.xml (revision 1170)
+++ trunk/acerola3d/build.xml (revision 1171)
@@ -253,9 +253,11 @@
253253 <delete includeEmptyDirs="true">
254254 <fileset dir="release/Acerola3D_Libraries/">
255255 <include name="**"/>
256- <exclude name="A3Viewer.bat"/>
256+ <exclude name="A3Viewer32.bat"/>
257+ <exclude name="A3Viewer64.bat"/>
257258 <exclude name="A3Viewer.command"/>
258- <exclude name="CommandPrompt.bat"/>
259+ <exclude name="CommandPrompt32.bat"/>
260+ <exclude name="CommandPrompt64.bat"/>
259261 <exclude name="Terminal.command"/>
260262 <exclude name="a3shell.sh"/>
261263 <exclude name="a3files"/>
--- trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer.bat (revision 1170)
+++ trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer.bat (nonexistent)
@@ -1,5 +0,0 @@
1-@echo off
2-set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3-set PATH=%~dp0Java\jdk\bin;%PATH%
4-if "%1" == "" (java jp.sourceforge.acerola3d.a3viewer.A3Viewer) else java jp.sourceforge.acerola3d.a3viewer.A3Viewer -open %1
5-pause
--- trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt.bat (revision 1170)
+++ trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt.bat (nonexistent)
@@ -1,4 +0,0 @@
1-@echo off
2-set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3-set PATH=%~dp0Java\jdk\bin;%PATH%
4-%windir%\system32\cmd.exe
--- trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer32.bat (nonexistent)
+++ trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer32.bat (revision 1171)
@@ -0,0 +1,6 @@
1+@echo off
2+set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3+set PATH=%~dp0Java\jdk\bin;%PATH%
4+set PATH=%~dp0natives\windows-i586;%PATH%
5+if "%1" == "" (java jp.sourceforge.acerola3d.a3viewer.A3Viewer) else java jp.sourceforge.acerola3d.a3viewer.A3Viewer -open %1
6+pause
--- trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer64.bat (nonexistent)
+++ trunk/acerola3d/release/Acerola3D_Libraries/A3Viewer64.bat (revision 1171)
@@ -0,0 +1,6 @@
1+@echo off
2+set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3+set PATH=%~dp0Java\jdk\bin;%PATH%
4+set PATH=%~dp0natives\windows-amd64;%PATH%
5+if "%1" == "" (java jp.sourceforge.acerola3d.a3viewer.A3Viewer) else java jp.sourceforge.acerola3d.a3viewer.A3Viewer -open %1
6+pause
--- trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt32.bat (nonexistent)
+++ trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt32.bat (revision 1171)
@@ -0,0 +1,5 @@
1+@echo off
2+set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3+set PATH=%~dp0Java\jdk\bin;%PATH%
4+set PATH=%~dp0natives\windows-i586;%PATH%
5+%windir%\system32\cmd.exe
--- trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt64.bat (nonexistent)
+++ trunk/acerola3d/release/Acerola3D_Libraries/CommandPrompt64.bat (revision 1171)
@@ -0,0 +1,5 @@
1+@echo off
2+set CLASSPATH=.;%~dp0lib\*;%~dp0a3files;%CLASSPATH%
3+set PATH=%~dp0Java\jdk\bin;%PATH%
4+set PATH=%~dp0natives\windows-amd64;%PATH%
5+%windir%\system32\cmd.exe
--- trunk/acerola3d/release/Acerola3D_Libraries/a3shell.sh (revision 1170)
+++ trunk/acerola3d/release/Acerola3D_Libraries/a3shell.sh (revision 1171)
@@ -29,5 +29,7 @@
2929 export CLASSPATH
3030 PATH="$INSTALL_DIR/Java/jdk/bin:$INSTALL_DIR/Java/jre/bin:$PATH"
3131 export PATH
32+LD_LIBRARY_PATH="$INSTALL_DIR/natives/linux-amd64"
33+export LD_LIBRARY_PATH
3234
3335 bash
Show on old repository browser