Skip to content

Xcc 1.10.12 submicro version addition #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Xcc 1.10.12 submicro version addition #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b4cda
Windows-Versionierung auf vier Stellen erweitert
c4banro Jan 17, 2025
3013d79
Anpassungen an den mod_managed Core-Projekten. #5486
c4banro Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions c4b/copybuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
$BuildPath="..\x64\Release\"
$XCCPath="D:\git\freeswitch\C4B\XCC\"

$filesToCopy = `
"FreeSwitch.dll",
"FreeSwitchConsole.exe",
"fs_cli.exe",
"libapr.dll",
"libbroadvoice.dll",
"libpng16.dll",
"libpq.dll",
"libsndfile-1.dll",
"libspandsp.dll",
"libteletone.dll",
"lua53.dll",
"openssl.exe",
"pcre.dll",
"pocketsphinx.dll",
"pthread.dll",
"sphinxbase.dll",
"zlib.dll",
"\mod\FreeSWITCH.Managed.dll",
"\mod\FreeSWITCH.ManagedCore.deps.json",
"\mod\FreeSWITCH.ManagedCore.dll",
"\mod\FreeSWITCH.ManagedCore.runtimeconfig.json",
"\mod\mod_callcenter.dll",
"\mod\mod_commands.dll",
"\mod\mod_conference.dll",
"\mod\mod_console.dll",
"\mod\mod_dialplan_xml.dll",
"\mod\mod_dptools.dll",
"\mod\mod_event_socket.dll",
"\mod\mod_expr.dll",
"\mod\mod_fifo.dll",
"\mod\mod_fsv.dll",
"\mod\mod_hash.dll",
"\mod\mod_local_stream.dll",
"\mod\mod_logfile.dll",
"\mod\mod_loopback.dll",
"\mod\mod_lua.dll",
"\mod\mod_managed.dll",
"\mod\mod_managedcore.dll",
"\mod\mod_native_file.dll",
"\mod\mod_opus.dll",
"\mod\mod_png.dll",
"\mod\mod_siren.dll",
"\mod\mod_sndfile.dll",
"\mod\mod_sofia.dll",
"\mod\mod_spandsp.dll",
"\mod\mod_tone_stream.dll",
"\mod\mod_verto.dll"


function CopyDll ($dllName)
{
$source = Join-Path -Path $BuildPath -ChildPath $dllName -Resolve -ErrorAction Stop
$destination = Join-Path -Path $XCCPath -ChildPath $dllName
$destinationDirectory = Split-Path -Path $destination -Parent

New-Item -Path $destinationDirectory -ItemType Directory -Force
Copy-Item -Path $source -Destination $destination -ErrorAction Stop
Set-ItemProperty -Path $destination -Name IsReadOnly -Value $false -ErrorAction Stop
}


foreach ($file in $filesToCopy)
{
CopyDll $file
}

# robocopy $BuildPath $XCCPath *.exe *.dll *.json /s /a-:R /xl /xx
5 changes: 3 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ AC_INIT([freeswitch], [1.10.12-release], bugs@freeswitch.org)
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
AC_SUBST(SWITCH_VERSION_MINOR, [10])
AC_SUBST(SWITCH_VERSION_MICRO, [12-release])
AC_SUBST(SWITCH_VERSION_REVISION, [])
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
AC_SUBST(SWITCH_VERSION_SUBMICRO, [2])
AC_SUBST(SWITCH_VERSION_REVISION, [C4B])
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [C4B])

AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])

Expand Down
5 changes: 3 additions & 2 deletions src/include/switch_version.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ extern "C" {
#define SWITCH_VERSION_MAJOR "@SWITCH_VERSION_MAJOR@"
#define SWITCH_VERSION_MINOR "@SWITCH_VERSION_MINOR@"
#define SWITCH_VERSION_MICRO "@SWITCH_VERSION_MICRO@"
#define SWITCH_VERSION_SUBMICRO "@SWITCH_VERSION_SUBMICRO@"
#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@" "~" _fs__bits
#define SWITCH_VERSION_REVISION_HUMAN "@SWITCH_VERSION_REVISION_HUMAN@" " " _fs__bits
#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO SWITCH_VERSION_REVISION
#define SWITCH_VERSION_FULL_HUMAN SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " " SWITCH_VERSION_REVISION_HUMAN
#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "." SWITCH_VERSION_SUBMICRO SWITCH_VERSION_REVISION
#define SWITCH_VERSION_FULL_HUMAN SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "." SWITCH_VERSION_SUBMICRO " " SWITCH_VERSION_REVISION_HUMAN

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions src/mod/languages/mod_managedcore/managed/FreeSWITCH.ManagedCore.2019.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<Platforms>x64</Platforms>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>..\..\..\..\..\x64\Debug\mod\</OutDir>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>..\..\..\..\..\x64\Release\mod\</OutDir>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/mod/languages/mod_managedcore/mod_managedcore.2017.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.6\runtimes\win-x64\native;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.0\runtimes\win-x64\native;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -130,7 +130,7 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
<AdditionalLibraryDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.6\runtimes\win-x64\native;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.0\runtimes\win-x64\native;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -162,7 +162,7 @@
</Midl>
<ClCompile>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.6\runtimes\win-x64\native;..\..\..\..\libs\apr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.0\runtimes\win-x64\native;..\..\..\..\libs\apr\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
Expand All @@ -179,7 +179,7 @@
<TargetMachine>MachineX64</TargetMachine>
<AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libnethost.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.6\runtimes\win-x64\native;$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\Program Files\dotnet\packs\Microsoft.NETCore.App.Host.win-x64\8.0.0\runtimes\win-x64\native;$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand Down
6 changes: 3 additions & 3 deletions w32/Console/switch_version.rc2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include <verrsrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
PRODUCTVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
FILEVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,SWITCH_VERSION_SUBMICRO
PRODUCTVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,SWITCH_VERSION_SUBMICRO
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
Expand Down Expand Up @@ -34,7 +34,7 @@ BEGIN
#endif
#endif
VALUE "FileDescription", "FreeSwitchConsole " SWITCH_VERSION_ALL
VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR "." SWITCH_VERSION_SUBMICRO_STR
VALUE "InternalName", "Freeswitch Console " SWITCH_VERSION_ALL
VALUE "LegalCopyright", "© 2005-" SWITCH_VERSION_YEAR " www.freeswitch.org"
VALUE "OriginalFilename", "FreeSwitchConsole.exe"
Expand Down
4 changes: 3 additions & 1 deletion w32/Library/switch_version.inc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
#define SWITCH_VERSION_MINOR_STR STR(SWITCH_VERSION_MINOR)
#define SWITCH_VERSION_MICRO @SWITCH_VERSION_MICRO@
#define SWITCH_VERSION_MICRO_STR STR(SWITCH_VERSION_MICRO)
#define SWITCH_VERSION_SUBMICRO @SWITCH_VERSION_SUBMICRO@
#define SWITCH_VERSION_SUBMICRO_STR STR(SWITCH_VERSION_SUBMICRO)
#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@"
#define SWITCH_VERSION_REVISION_HUMAN "@SWITCH_VERSION_REVISION_HUMAN@"
#define SWITCH_VERSION_YEAR "@SWITCH_VERSION_YEAR@"
#define SWITCH_VERSION_ALL "@SWITCH_VERSION_MAJOR@.@SWITCH_VERSION_MINOR@.@SWITCH_VERSION_MICRO@"
#define SWITCH_VERSION_ALL "@SWITCH_VERSION_MAJOR@.@SWITCH_VERSION_MINOR@.@SWITCH_VERSION_MICRO@.@SWITCH_VERSION_SUBMICRO@"
10 changes: 5 additions & 5 deletions w32/Library/switch_version.rc2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "switch_version.inc"
#include <verrsrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
PRODUCTVERSION SWITCH_VERSION_MAJOR,SWITCH_VERSION_MINOR,SWITCH_VERSION_MICRO,0
VS_VERSION_INFO VERSIONINFO
FILEVERSION SWITCH_VERSION_MAJOR, SWITCH_VERSION_MINOR, SWITCH_VERSION_MICRO, SWITCH_VERSION_SUBMICRO
PRODUCTVERSION SWITCH_VERSION_MAJOR, SWITCH_VERSION_MINOR, SWITCH_VERSION_MICRO, SWITCH_VERSION_SUBMICRO
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
Expand Down Expand Up @@ -33,13 +33,13 @@ BEGIN
VALUE "FileDescription", "FreeSwitch Core Lib " SWITCH_VERSION_ALL " x86/win32 Release"
#endif
#endif
VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
VALUE "FileVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR "." SWITCH_VERSION_SUBMICRO_STR
VALUE "InternalName", "Freeswitch.dll " SWITCH_VERSION_ALL
VALUE "LegalCopyright", "© 2005-" SWITCH_VERSION_YEAR " www.freeswitch.org"
VALUE "OriginalFilename", "Freeswitch.dll"
VALUE "PrivateBuild", ""
VALUE "ProductName", "FreeSwitch Core Library " SWITCH_VERSION_REVISION_HUMAN
VALUE "ProductVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR
VALUE "ProductVersion", SWITCH_VERSION_MAJOR_STR "." SWITCH_VERSION_MINOR_STR "." SWITCH_VERSION_MICRO_STR "." SWITCH_VERSION_SUBMICRO_STR
VALUE "SpecialBuild", SWITCH_VERSION_REVISION
END
END
Expand Down
Loading