Skip to content

Commit

Permalink
Various works on SWIG Java (#4273)
Browse files Browse the repository at this point in the history 
* Various works on SWIG Java

1. Fix type mapping (SWIGTYPE_*):
   a. Map C "void*" & "void**" to Java long (was SWIGTYPE_p_void & SWIGTYPE_p_p_void which are not really usable), this should fix #4242.
   b. Map pjmedia_aud_dev_index to int.
   c. Map unsigned char[20] for SslCertInfo.serialNo to Java "short array"

   This also updates pjsua.i, e.g: tab->space, reorder things.

2. Update swig_java_pjsua2.vcxproj:
   a. Rename config "Debug" & "Release" to "Debug-Dynamic" & "Release-Dynamic" in , as the project actually builds dynamic libs. Also fix the property sheet dependencies from *-static to *-dynamic.
   b. Update other settings, e.g: built tool version from 140 to 143.

3. Update symbols.lst: added missing new types, tab->space, reorder alphabetically.

* Update ci-win.yml
* Add sample code for passing user data using utilTimerSchedule()
* Add sample for cancelling timer
  • Loading branch information
@nanangizz
nanangizz authored Jan 29, 2025
1 parent c36ed2c commit 960597e
Show file tree
Hide file tree
Showing 10 changed files with 468 additions and 396 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-win.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
set INCLUDE=%INCLUDE%;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
cd pjsip-apps/build
msbuild swig_java_pjsua2.vcxproj /p:PlatformToolset=v143 /p:Configuration=Debug /p:Platform=win32 /p:UseEnv=true
msbuild swig_java_pjsua2.vcxproj /p:PlatformToolset=v143 /p:Configuration=Debug-Dynamic /p:Platform=win32 /p:UseEnv=true
shell: cmd

openssl-1:
Expand Down
60 changes: 30 additions & 30 deletions pjproject-vs14.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2382,36 +2382,36 @@ Global
{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.Build.0 = Release-Static|Win32
{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.ActiveCfg = Release-Static|x64
{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.Build.0 = Release-Static|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Any CPU.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM64.ActiveCfg = Debug|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Win32.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|x64.ActiveCfg = Debug|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Any CPU.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Any CPU.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM64.ActiveCfg = Debug|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Win32.ActiveCfg = Debug|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|x64.ActiveCfg = Debug|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Any CPU.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM64.ActiveCfg = Release|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Win32.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|x64.ActiveCfg = Release|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Any CPU.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|x64.ActiveCfg = Release|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Any CPU.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM64.ActiveCfg = Release|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Win32.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|x64.ActiveCfg = Release|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Any CPU.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM64.ActiveCfg = Debug-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Win32.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|x64.ActiveCfg = Debug-Dynamic|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Any CPU.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM64.ActiveCfg = Debug-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Win32.ActiveCfg = Debug-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|x64.ActiveCfg = Debug-Dynamic|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Any CPU.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM64.ActiveCfg = Release-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Win32.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|x64.ActiveCfg = Release-Dynamic|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Any CPU.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM64.ActiveCfg = Release-Dynamic|ARM64
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Win32.ActiveCfg = Release-Dynamic|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|x64.ActiveCfg = Release-Dynamic|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|Any CPU.ActiveCfg = Debug|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|ARM.ActiveCfg = Debug|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|ARM64.ActiveCfg = Debug|ARM64
Expand Down
Loading

0 comments on commit 960597e

Please sign in to comment.