Skip to content

Commit

Permalink
Add missing PJLIB dir in SWIG include dir search in VS2005 SWIG Java …
Browse files Browse the repository at this point in the history 
…project (#4070)
  • Loading branch information
@nanangizz
nanangizz authored Sep 11, 2024
1 parent a6ed899 commit 9b6744f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
8 changes: 4 additions & 4 deletions pjsip-apps/build/swig_java_pjsua2.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\src\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjlib\include -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;rem javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
Outputs="$(TargetDir)pjsua2_wrap.cpp;$(TargetDir)pjsua2_wrap.h"
/>
</FileConfiguration>
Expand All @@ -366,7 +366,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\src\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjlib\include -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;rem javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
Outputs="%(Filename)_wrap.cxx"
/>
</FileConfiguration>
Expand All @@ -375,7 +375,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\src\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjlib\include -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;rem javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
Outputs="$(TargetDir)pjsua2_wrap.cpp;$(TargetDir)pjsua2_wrap.h"
/>
</FileConfiguration>
Expand All @@ -384,7 +384,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\src\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
CommandLine="@echo off&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo - Make sure &apos;swig&apos; and &apos;javac&apos; locations are in your PATH environment vars.&#x0D;&#x0A;@echo - Make sure Java SDK header file directories&#x0D;&#x0A;@echo (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)&#x0D;&#x0A;@echo are in your MSVC header search path&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;&#x0D;&#x0A;@echo on&#x0D;&#x0A;mkdir $(TargetDir)org\pjsip\pjsua2&#x0D;&#x0A;swig -c++ -java -package org.pjsip.pjsua2 -I$(SolutionDir)pjlib\include -I$(SolutionDir)pjsip\include -outdir $(TargetDir)org\pjsip\pjsua2 -o $(TargetDir)pjsua2_wrap.cpp $(InputPath)&#x0D;&#x0A;javac -d $(TargetDir) $(TargetDir)org\pjsip\pjsua2\*.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(InputDir)java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\test.java&#x0D;&#x0A;javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample.java&#x0D;&#x0A;rem javac -d $(TargetDir) -classpath &quot;$(InputDir)java\output&quot; $(TargetDir)..\sample2.java&#x0D;&#x0A;&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo After the build completed succesfully, try to run the test app, e.g:&#x0D;&#x0A;@echo java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path=&quot;D:\projects\pjproject\pjsip-apps\src\swig\java\output&quot; org.pjsip.pjsua2.app.sample&#x0D;&#x0A;@echo **************************************************************&#x0D;&#x0A;@echo off&#x0D;&#x0A;"
Outputs="$(TargetDir)pjsua2_wrap.cpp;$(TargetDir)pjsua2_wrap.h"
/>
</FileConfiguration>
Expand Down
12 changes: 11 additions & 1 deletion pjsip-apps/src/swig/java/sample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ public class sample {
private static MyApp app = new MyApp();
private static MyObserver observer = new MyObserver();
private static MyAccount account = null;
private static AccountConfig accCfg = null;
private static AccountConfig accCfg = null;
private static MyCall call = null;

// Snippet code to set native window to output video
/*
Expand Down Expand Up @@ -156,6 +157,15 @@ private static void runWorker() {

try {
account.modify(accCfg);

/* Make call to self */
/*
call = new MyCall(app.accList.get(0), -1);
CallOpParam prm = new CallOpParam(true);
prm.getOpt().setAudioCount(1);
prm.getOpt().setVideoCount(0);
call.makeCall("sip:localhost:6000", prm);
*/
} catch (Exception e) {}

while (!Thread.currentThread().isInterrupted()) {
Expand Down

0 comments on commit 9b6744f

Please sign in to comment.