From a2a9a8d96fa2e6406c9bd87ef3791de9b3f89895 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Mon, 3 Aug 2026 15:35:45 +0100 Subject: [PATCH] Configuration - Clean up unsupported scripts and templates (#1428) Removed adm/scripts which were no longer actual and not validated. Removed adm/templates which were no longer used and not validated. Fixed the issue with the mixing FreeType/FreeImage inside env.bat --- adm/scripts/.gitignore | 2 - adm/scripts/android_build.bat | 268 --------------- adm/scripts/android_custom.bat.template | 33 -- adm/scripts/build_common.bat | 8 - adm/scripts/build_common.sh | 30 -- adm/scripts/cmake_custom.bat.template | 44 --- adm/scripts/cmake_custom.sh.template | 39 --- adm/scripts/cmake_gen.bat | 84 ----- adm/scripts/cmake_gen.sh | 84 ----- adm/scripts/ios_build.sh | 266 --------------- adm/scripts/ios_custom.sh.template | 30 -- adm/scripts/macos_build.sh | 267 --------------- adm/scripts/macos_custom.sh.template | 31 -- adm/scripts/mingw_build.bat | 266 --------------- adm/scripts/mingw_custom.bat.template | 29 -- adm/scripts/wasm_build.bat | 333 ------------------- adm/scripts/wasm_build.sh | 126 ------- adm/scripts/wasm_custom.bat.template | 29 -- adm/scripts/wasm_custom.sh.template | 16 - adm/scripts/wasm_sample_build.bat | 117 ------- adm/templates/android.toolchain.config.cmake | 8 - adm/templates/codeblocks.bat | 20 -- adm/templates/codeblocks.sh | 12 - adm/templates/env.bat | 2 +- 24 files changed, 1 insertion(+), 2143 deletions(-) delete mode 100644 adm/scripts/.gitignore delete mode 100644 adm/scripts/android_build.bat delete mode 100644 adm/scripts/android_custom.bat.template delete mode 100644 adm/scripts/build_common.bat delete mode 100644 adm/scripts/build_common.sh delete mode 100644 adm/scripts/cmake_custom.bat.template delete mode 100644 adm/scripts/cmake_custom.sh.template delete mode 100644 adm/scripts/cmake_gen.bat delete mode 100755 adm/scripts/cmake_gen.sh delete mode 100755 adm/scripts/ios_build.sh delete mode 100644 adm/scripts/ios_custom.sh.template delete mode 100755 adm/scripts/macos_build.sh delete mode 100644 adm/scripts/macos_custom.sh.template delete mode 100644 adm/scripts/mingw_build.bat delete mode 100644 adm/scripts/mingw_custom.bat.template delete mode 100644 adm/scripts/wasm_build.bat delete mode 100755 adm/scripts/wasm_build.sh delete mode 100644 adm/scripts/wasm_custom.bat.template delete mode 100644 adm/scripts/wasm_custom.sh.template delete mode 100644 adm/scripts/wasm_sample_build.bat delete mode 100644 adm/templates/android.toolchain.config.cmake delete mode 100644 adm/templates/codeblocks.bat delete mode 100755 adm/templates/codeblocks.sh diff --git a/adm/scripts/.gitignore b/adm/scripts/.gitignore deleted file mode 100644 index 3e9b15d9a3..0000000000 --- a/adm/scripts/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*custom.bat -*custom.sh diff --git a/adm/scripts/android_build.bat b/adm/scripts/android_build.bat deleted file mode 100644 index 23a81ca42a..0000000000 --- a/adm/scripts/android_build.bat +++ /dev/null @@ -1,268 +0,0 @@ -@echo OFF - -rem Auxiliary script for semi-automated building of OCCT for Android platform. -rem android_custom.bat should be configured with paths -rem to CMake, 3rd-parties, Android NDK and MinGW make tool. - -set "aCasSrc=%~dp0..\.." -set "aBuildRoot=%aCasSrc%\work" - -set aNbJobs=%NUMBER_OF_PROCESSORS% - -rem Paths to 3rd-party tools and libraries -set "anNdkPath=" -set "aFreeType=" -set "aRapidJson=" -set "aDraco=" - -rem Build stages to perform -set "toCMake=1" -set "toClean=0" -set "toMake=1" -set "toInstall=1" -set "toPack=1" -set "isStatic=0" - -rem Minimal Android platform and CPU architectures -set "anNdkApiLevel=21" -set "anNdkAbiList=armeabi-v7a x86 arm64-v8a x86_64" - -rem OCCT Modules to build -set "BUILD_ModelingData=ON" -set "BUILD_ModelingAlgorithms=ON" -set "BUILD_Visualization=ON" -set "BUILD_ApplicationFramework=ON" -set "BUILD_DataExchange=ON" - -rem Optional 3rd-party libraries to enable -set "USE_FREETYPE=ON" -set "USE_RAPIDJSON=OFF" -set "USE_DRACO=OFF" - -rem Archive tool -set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" -set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe" - -rem Configuration file -if exist "%~dp0android_custom.bat" call "%~dp0android_custom.bat" - -set "aCompiler=gcc" -set "aCppLib=gnustl_shared" -if not exist "%anNdkPath%/sources/cxx-stl/gnu-libstdc++" ( - if exist "%anNdkPath%/sources/cxx-stl/llvm-libc++" ( - set "aCompiler=clang" - set "aCppLib=c++_shared" - ) -) -set "aLibType=Shared" -if ["%isStatic%"] == ["1"] set "aLibType=Static" -set "aDestDir=%aBuildRoot%\android-%aCompiler%" -if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aDestDir%" - ) -) - -set "anOcctVerSuffix=" -set "anOcctVersion=0.0.0" -set "aGitBranch=" -rem Get OCCT version -call "%~dp0build_common.bat" -set "aGitBranch=" -for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" ) - -for %%s in (%anNdkAbiList%) do ( - call :cmakeGenerate "%anNdkApiLevel%" "%%s" - if errorlevel 1 ( - if not ["%1"] == ["-nopause"] ( - pause - ) - exit /B 1 - goto :eof - ) -) - -for /F "skip=1 delims=" %%F in (' - wmic PATH Win32_LocalTime GET Day^,Month^,Year /FORMAT:TABLE -') do ( - for /F "tokens=1-3" %%L in ("%%F") do ( - set DAY00=0%%L - set MONTH00=0%%M - set YEAR=%%N - ) -) -set DAY00=%DAY00:~-2% -set MONTH00=%MONTH00:~-2% -set "aRevision=-%YEAR%-%MONTH00%-%DAY00%" -rem set "aRevision=-%aGitBranch%" -set "anArchName=occt-%anOcctVersion%%anOcctVerSuffix%%aRevision%-android" -set "aTarget=%aBuildRoot%\%anArchName%" -if ["%toPack%"] == ["1"] ( - echo Creating archive %anArchName%.7z - rmdir /S /Q "%aTarget%" - if not exist "%aTarget%" ( mkdir "%aTarget%" ) - if exist "%aBuildRoot%/%anArchName%.7z" del "%aBuildRoot%/%anArchName%.7z" - xcopy /S /Y "%aDestDir%\*" "%aTarget%\" - - "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%" -) -if not ["%1"] == ["-nopause"] ( - pause -) - -goto :eof - -:cmakeGenerate -set "anApi=%~1" -set "anAbi=%~2" -if ["%anApi%"] == [""] ( - set "anApi=21" - if ["%anAbi%"] == ["armeabi-v7a"] ( set "anApi=16" ) - if ["%anAbi%"] == ["x86"] ( set "anApi=16" ) -) -set "aPlatformAndCompiler=android-%anAbi%-%aCompiler%" -set "aWorkDir=%aBuildRoot%\%aPlatformAndCompiler%-make" -set "aLogFile=%aBuildRoot%\build-%aPlatformAndCompiler%.log" -if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aWorkDir%" - ) -) -if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" ) -if exist "%aLogFile%" ( del "%aLogFile%" ) - -rem include some information about OCCT into archive -echo ^> "%aWorkDir%\VERSION.html" -git status >> "%aWorkDir%\VERSION.html" -git log -n 100 >> "%aWorkDir%\VERSION.html" -echo ^>> "%aWorkDir%\VERSION.html" - -echo Start building OCCT for %aPlatformAndCompiler% -echo Start building OCCT for %aPlatformAndCompiler%, API level %anApi%>> %aLogFile% - -pushd "%aWorkDir%" - -set "aFreeTypeLibName=libfreetype.so" -if exist "%aFreeType%/libs/%anAbi%/libfreetype.a" ( set "aFreeTypeLibName=libfreetype.a" ) - -set "aTimeZERO=%TIME%" -if ["%toCMake%"] == ["1"] ( - echo Configuring OCCT for Android %anAbi%, API level %anApi%... - cmake -G "MinGW Makefiles" ^ - -D CMAKE_SYSTEM_NAME:STRING="Android" ^ - -D CMAKE_ANDROID_NDK="%anNdkPath%" ^ - -D CMAKE_BUILD_TYPE:STRING="Release" ^ - -D CMAKE_ANDROID_ARCH_ABI:STRING="%anAbi%" ^ - -D CMAKE_SYSTEM_VERSION:STRING="%anApi%" ^ - -D CMAKE_ANDROID_STL_TYPE="%aCppLib%" ^ - -D BUILD_LIBRARY_TYPE:STRING="%aLibType%" ^ - -D INSTALL_DIR:PATH="%aDestDir%" ^ - -D INSTALL_DIR_INCLUDE:STRING="inc" ^ - -D INSTALL_DIR_LIB:STRING="libs/%anAbi%" ^ - -D INSTALL_DIR_CMAKE:STRING="libs/%anAbi%/cmake/opencascade" ^ - -D INSTALL_DIR_RESOURCE:STRING="src" ^ - -D BUILD_MODULE_FoundationClasses:BOOL="ON" ^ - -D BUILD_MODULE_ModelingData:BOOL="%BUILD_ModelingData%" ^ - -D BUILD_MODULE_ModelingAlgorithms:BOOL="%BUILD_ModelingAlgorithms%" ^ - -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^ - -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^ - -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^ - -D BUILD_MODULE_Draw:BOOL="OFF" ^ - -D BUILD_DOC_Overview:BOOL="OFF" ^ - -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^ - -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^ - -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="%aFreeType%/libs/%anAbi%" ^ - -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="%aFreeType%/libs/%anAbi%/%aFreeTypeLibName%" ^ - -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^ - -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^ - -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^ - -D USE_DRACO:BOOL="%USE_DRACO%" ^ - -D 3RDPARTY_DRACO_DIR:PATH="%aDraco%" ^ - -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="%aDraco%/include" ^ - -D 3RDPARTY_DRACO_LIBRARY_DIR_draco:PATH="%aDraco%/libs/%anAbi%" ^ - "%aCasSrc%" - - if errorlevel 1 ( - popd - exit /B 1 - goto :eof - ) -) -set "aTimeGEN=%TIME%" -call :computeDuration %aTimeZERO% %aTimeGEN% -if ["%toCMake%"] == ["1"] ( - echo Generation time: %DURATION% - echo Generation time: %DURATION%>> "%aLogFile%" -) - -if ["%toClean%"] == ["1"] ( - mingw32-make clean -) - -if ["%toMake%"] == ["1"] ( - echo Building... - mingw32-make -j %aNbJobs% 2>> "%aLogFile%" - if errorlevel 1 ( - type "%aLogFile%" - popd - exit /B 1 - goto :eof - ) - type "%aLogFile%" -) -set "aTimeBUILD=%TIME%" -call :computeDuration %aTimeGEN% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Building time: %DURATION% - echo Building time: %DURATION%>> "%aLogFile%" -) -call :computeDuration %aTimeZERO% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Total building time: %DURATION% - echo Total building time: %DURATION%>> "%aLogFile%" -) - -if ["%toInstall%"] == ["1"] ( - echo Installing into %aDestDir%... - mingw32-make install 2>> "%aLogFile%" - copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html" -) -set "aTimeINSTALL=%TIME%" -call :computeDuration "%aTimeBUILD%" "%aTimeINSTALL%" -if ["%toInstall%"] == ["1"] ( - echo Install time: %DURATION% - echo Install time: %DURATION%>> "%aLogFile%" -) - -call :computeDuration "%aTimeZERO%" "%aTimeINSTALL%" -echo Total time: %DURATION% -echo Total time: %DURATION%>> "%aLogFile%" - -popd -goto :eof - -:computeDuration -set "aTimeFrom=%~1" -set "aTimeEnd=%~2" -rem handle time before 10AM (win10 - remove empty space at the beginning) -if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%" -if "%aTimeEnd:~0,1%"==" " set "aTimeEnd=%aTimeEnd:~1%" -rem handle time before 10AM (win7 - add 0 at the beginning) -if "%aTimeFrom:~1,1%"==":" set "aTimeFrom=0%aTimeFrom%" -if "%aTimeEnd:~1,1%"==":" set "aTimeEnd=0%aTimeEnd%" -rem convert hours:minutes:seconds:ms into duration -set /A aTimeFrom=(1%aTimeFrom:~0,2%-100)*360000 + (1%aTimeFrom:~3,2%-100)*6000 + (1%aTimeFrom:~6,2%-100)*100 + (1%aTimeFrom:~9,2%-100) -set /A aTimeEnd= (1%aTimeEnd:~0,2%-100)*360000 + (1%aTimeEnd:~3,2%-100)*6000 + (1%aTimeEnd:~6,2%-100)*100 + (1%aTimeEnd:~9,2%-100) -set /A aDurTotalSec=%aTimeEnd%-%aTimeFrom% -if %aTimeEnd% LSS %aTimeFrom% set set /A aDurTotalSec=%aTimeFrom%-%aTimeEnd% -set /A aDurHH=%aDurTotalSec% / 360000 -set /A aDurMM=(%aDurTotalSec% - %aDurHH%*360000) / 6000 -set /A aDurSS=(%aDurTotalSec% - %aDurHH%*360000 - %aDurMM%*6000) / 100 -if %aDurHH% LSS 10 set aDurHH=0%aDurHH% -if %aDurMM% LSS 10 set aDurMM=0%aDurMM% -if %aDurSS% LSS 10 set aDurSS=0%aDurSS% - -set "DURATION=%aDurHH%:%aDurMM%:%aDurSS%" -goto :eof diff --git a/adm/scripts/android_custom.bat.template b/adm/scripts/android_custom.bat.template deleted file mode 100644 index 45881c6d40..0000000000 --- a/adm/scripts/android_custom.bat.template +++ /dev/null @@ -1,33 +0,0 @@ -rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat) - -rem Paths to 3rd-party tools and libraries -rem call c:\TDM-GCC-64\mingwvars.bat -rem set "PATH=c:\CMake\bin;%PATH%" -rem set "anNdkPath=c:/android-ndk-r12" -rem set "aFreeType=c:/freetype-2.7.1-android" -rem set "aRapidJson=c:/rapidjson-1.1.0" -rem set "aDraco=c:/draco-1.4.1-android" - -rem Uncomment to customize building steps -rem set "aBuildRoot=%~dp0..\..\work" -rem set "toCMake=1" -rem set "toClean=0" -rem set "toMake=1" -rem set "toInstall=1" -rem set "toPack=1" -rem set "isStatic=0" - -rem Minimal Android platform and CPU architectures -rem set "anNdkApiLevel=21" -rem set "anNdkAbiList=arm64-v8a x86_64" - -rem OCCT Modules to build -rem set "BUILD_ModelingData=ON" -rem set "BUILD_ModelingAlgorithms=ON" -rem set "BUILD_Visualization=ON" -rem set "BUILD_ApplicationFramework=ON" -rem set "BUILD_DataExchange=ON" - -rem Optional 3rd-party libraries to enable -rem set "USE_RAPIDJSON=ON" -rem set "USE_DRACO=ON" diff --git a/adm/scripts/build_common.bat b/adm/scripts/build_common.bat deleted file mode 100644 index 7228b6cfb4..0000000000 --- a/adm/scripts/build_common.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo OFF - -rem Extract version info from version.cmake -for /f tokens^=2^ delims^=^" %%i in ('findstr OCC_VERSION_DEVELOPMENT "%~dp0\..\cmake\version.cmake"') do ( set "anOcctVerSuffix=%%i" ) -for /f tokens^=3 %%i in ('findstr OCC_VERSION_MAJOR "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MAJOR=%%i" ) -for /f tokens^=3 %%i in ('findstr OCC_VERSION_MINOR "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MINOR=%%i" ) -for /f tokens^=3 %%i in ('findstr OCC_VERSION_MAINTENANCE "%~dp0\..\cmake\version.cmake"') do ( set "OCC_VERSION_MAINTENANCE=%%i" ) -set "anOcctVersion=%OCC_VERSION_MAJOR%.%OCC_VERSION_MINOR%.%OCC_VERSION_MAINTENANCE%" diff --git a/adm/scripts/build_common.sh b/adm/scripts/build_common.sh deleted file mode 100644 index 5c820f7e4a..0000000000 --- a/adm/scripts/build_common.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Ensure script dir is defined -if [ -z "$aScriptDir" ]; then - aScriptDir=$(dirname "$0") -fi - -# Check if version file exists -versionFile="$aScriptDir/../cmake/version.cmake" -if [ ! -f "$versionFile" ]; then - echo "Error: version.cmake not found" - exit 1 -fi - -# Extract version info from version.cmake -OCC_VERSION_MAJOR=$(awk '/set.*OCC_VERSION_MAJOR/ {print $3}' "$versionFile") -OCC_VERSION_MINOR=$(awk '/set.*OCC_VERSION_MINOR/ {print $3}' "$versionFile") -OCC_VERSION_MAINTENANCE=$(awk '/set.*OCC_VERSION_MAINTENANCE/ {print $3}' "$versionFile") -anOcctVerSuffix=$(awk '/set.*OCC_VERSION_DEVELOPMENT/ { - if (NF > 2) { - gsub(/[)" ]/, "", $3) - print $3 - } else { - print "" - } -}' "$versionFile") - -# Combine version string -anOcctVersion="${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}" - diff --git a/adm/scripts/cmake_custom.bat.template b/adm/scripts/cmake_custom.bat.template deleted file mode 100644 index 397b900bec..0000000000 --- a/adm/scripts/cmake_custom.bat.template +++ /dev/null @@ -1,44 +0,0 @@ -rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat) - -set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty" - -set VS=14 -set VSDATA=2015 - -rem Leave VSPLATFORM empty to build for x86 platform -set VSPLATFORM=Win64 - -rem ------------------------------------ -rem Uncomment to customize building steps -rem ------------------------------------ - -rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%" -rem set "INSTALL_DIR=%SrcRoot%\install" - -rem set BUILD_DOC_Overview=OFF -rem set BUILD_LIBRARY_TYPE=Shared -rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON -rem set BUILD_WITH_DEBUG=OFF -rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON -rem set BUILD_USE_PCH=OFF -rem set BUILD_FORCE_RelWithDebInfo=OFF - -rem Use semicolon-separated list of toolkits if you want to disable all modules -rem and build only some toolkits. -rem set BUILD_ADDITIONAL_TOOLKITS= - -rem set BUILD_MODULE_ApplicationFramework=ON -rem set BUILD_MODULE_DataExchange=ON -rem set BUILD_MODULE_Draw=ON -rem set BUILD_MODULE_ModelingAlgorithms=ON -rem set BUILD_MODULE_ModelingData=ON -rem set BUILD_MODULE_Visualization=ON - -rem set USE_D3D=OFF -rem set USE_FFMPEG=OFF -rem set USE_FREEIMAGE=OFF -rem set USE_GLES2=OFF -rem set USE_RAPIDJSON=OFF -rem set USE_DRACO=OFF -rem set USE_TBB=OFF -rem set USE_VTK=OFF diff --git a/adm/scripts/cmake_custom.sh.template b/adm/scripts/cmake_custom.sh.template deleted file mode 100644 index acd3acee56..0000000000 --- a/adm/scripts/cmake_custom.sh.template +++ /dev/null @@ -1,39 +0,0 @@ -# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh) - -OCCT3RDPARTY="$SrcRoot/../3rdparty" -FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1" - -# ------------------------------------ -# Uncomment to customize building steps -# ------------------------------------ - -#BUILD_DIR=build -#INSTALL_DIR="$SrcRoot/install" - -#BUILD_DOC_Overview=OFF -#BUILD_LIBRARY_TYPE=Shared -#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON -#BUILD_WITH_DEBUG=OFF -#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON - -# Use semicolon-separated list of toolkits if you want to disable all modules -# and build only some toolkits. -#BUILD_ADDITIONAL_TOOLKITS= - -#BUILD_MODULE_ApplicationFramework=ON -#BUILD_MODULE_DataExchange=ON -#BUILD_MODULE_Draw=ON -#BUILD_MODULE_ModelingAlgorithms=ON -#BUILD_MODULE_ModelingData=ON -#BUILD_MODULE_Visualization=ON - -#USE_FFMPEG=OFF -#USE_FREEIMAGE=OFF -#USE_GLES2=OFF -#USE_RAPIDJSON=OFF -#USE_DRACO=OFF -#USE_TBB=OFF -#USE_VTK=OFF - -# This is to add any additional arguments to cmake -#AUX_ARGS= diff --git a/adm/scripts/cmake_gen.bat b/adm/scripts/cmake_gen.bat deleted file mode 100644 index d95fe48cca..0000000000 --- a/adm/scripts/cmake_gen.bat +++ /dev/null @@ -1,84 +0,0 @@ -@echo off - -rem Auxiliary script for semi-automated building of OCCT using cmake. -rem cmake_custom.bat should be configured with VS version and path to 3rd-parties. -rem OCCT3RDPARTY must be specified as mandatory dependency. - -setlocal - -set "SrcRoot=%~dp0..\.." - -set VS=14 -set VSDATA=2015 -set VSPLATFORM=Win64 -set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%" -set "OCCT3RDPARTY=" -set "INSTALL_DIR=%SrcRoot%\install" - -set BUILD_ADDITIONAL_TOOLKITS= -set BUILD_DOC_Overview=OFF -set BUILD_LIBRARY_TYPE=Shared -set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON -set BUILD_WITH_DEBUG=OFF -set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON -set BUILD_USE_PCH=OFF -set BUILD_FORCE_RelWithDebInfo=OFF - -set BUILD_MODULE_ApplicationFramework=ON -set BUILD_MODULE_DataExchange=ON -set BUILD_MODULE_Draw=ON -set BUILD_MODULE_ModelingAlgorithms=ON -set BUILD_MODULE_ModelingData=ON -set BUILD_MODULE_Visualization=ON - -set USE_D3D=OFF -set USE_FFMPEG=OFF -set USE_FREEIMAGE=OFF -set USE_GLES2=OFF -set USE_RAPIDJSON=OFF -set USE_DRACO=OFF -set USE_TBB=OFF -set USE_VTK=OFF - -if exist "%~dp0cmake_custom.bat" call "%~dp0cmake_custom.bat" - -if not "%VSPLATFORM%"=="" set "arch_compile=Visual Studio %VS% %VSDATA% %VSPLATFORM%" -if "%VSPLATFORM%"=="" set "arch_compile=Visual Studio %VS% %VSDATA%" - -set "INSTALL_DIR=%INSTALL_DIR:\=/%" -set "OCCT3RDPARTY=%OCCT3RDPARTY:\=/%" - -set "BUILD_DIR=%SrcRoot%\%BUILD_DIR%" -if not exist "%BUILD_DIR%" mkdir "%BUILD_DIR%" -pushd "%BUILD_DIR%" - -cmake -G "%arch_compile%" ^ - -D 3RDPARTY_DIR:STRING="%OCCT3RDPARTY%" ^ - -D BUILD_ADDITIONAL_TOOLKITS:STRING="%BUILD_ADDITIONAL_TOOLKITS%" ^ - -D BUILD_DOC_Overview:BOOL=%BUILD_DOC_Overview% ^ - -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^ - -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^ - -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^ - -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^ - -D BUILD_MODULE_FoundationClasses:BOOL=ON ^ - -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^ - -D BUILD_MODULE_ModelingData:BOOL=%BUILD_MODULE_ModelingData% ^ - -D BUILD_MODULE_Visualization:BOOL=%BUILD_MODULE_Visualization% ^ - -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=%BUILD_RELEASE_DISABLE_EXCEPTIONS% ^ - -D BUILD_WITH_DEBUG:BOOL=%BUILD_WITH_DEBUG% ^ - -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=%BUILD_ENABLE_FPE_SIGNAL_HANDLER% ^ - -D BUILD_USE_PCH:BOOL=%BUILD_USE_PCH% ^ - -D BUILD_FORCE_RelWithDebInfo:BOOL=%BUILD_FORCE_RelWithDebInfo% ^ - -D INSTALL_DIR:PATH="%INSTALL_DIR%" ^ - -D USE_D3D:BOOL=%USE_D3D% ^ - -D USE_FFMPEG:BOOL=%USE_FFMPEG% ^ - -D USE_FREEIMAGE:BOOL=%USE_FREEIMAGE% ^ - -D USE_GLES2:BOOL=%USE_GLES2% ^ - -D USE_RAPIDJSON:BOOL=%USE_RAPIDJSON% ^ - -D USE_DRACO:BOOL=%USE_DRACO% ^ - -D USE_TBB:BOOL=%USE_TBB% ^ - -D USE_VTK:BOOL=%USE_VTK% ^ - "%SrcRoot%" - -popd -endlocal diff --git a/adm/scripts/cmake_gen.sh b/adm/scripts/cmake_gen.sh deleted file mode 100755 index ae2980f7a5..0000000000 --- a/adm/scripts/cmake_gen.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Auxiliary script for semi-automated building of OCCT using cmake. -# cmake_custom.sh should be configured with path to 3rd-parties. -# OCCT3RDPARTY and FREETYPE_DIR must be specified as mandatory dependencies. - -ScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -SrcRoot="${ScriptDir}/../.." - -INSTALL_DIR="$SrcRoot/install" - -BUILD_DIR=build -DEB= -CMAKE_BUILD_TYPE=Release -if [ "$1" = "-d" ]; then - DEB=d - BUILD_DIR=${BUILD_DIR}-deb - CMAKE_BUILD_TYPE=Debug -fi -INSTALL_DIR_BIN=lin64/gcc/bin$DEB -INSTALL_DIR_LIB=lin64/gcc/lib$DEB - -BUILD_ADDITIONAL_TOOLKITS= -BUILD_DOC_Overview=OFF -BUILD_LIBRARY_TYPE=Shared -BUILD_RELEASE_DISABLE_EXCEPTIONS=ON -BUILD_WITH_DEBUG=OFF -BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON - -BUILD_MODULE_ApplicationFramework=ON -BUILD_MODULE_DataExchange=ON -BUILD_MODULE_Draw=ON -BUILD_MODULE_ModelingAlgorithms=ON -BUILD_MODULE_ModelingData=ON -BUILD_MODULE_Visualization=ON - -USE_FFMPEG=OFF -USE_FREEIMAGE=OFF -USE_GLES2=OFF -USE_RAPIDJSON=OFF -USE_DRACO=OFF -USE_TBB=OFF -USE_VTK=OFF -AUX_ARGS= - -if [ -f "${ScriptDir}/cmake_custom.sh" ]; then - . "${ScriptDir}/cmake_custom.sh" -fi - -BUILD_DIR="$SrcRoot/$BUILD_DIR" -if [ ! -d "$BUILD_DIR" ]; then mkdir -p "$BUILD_DIR"; fi -pushd "$BUILD_DIR" - -cmake -G "Unix Makefiles" \ - -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ - -D 3RDPARTY_DIR:PATH="$OCCT3RDPARTY" \ - -D 3RDPARTY_FREETYPE_DIR:PATH="$FREETYPE_DIR" \ - -D BUILD_ADDITIONAL_TOOLKITS:STRING="$BUILD_ADDITIONAL_TOOLKITS" \ - -D BUILD_DOC_Overview:BOOL=$BUILD_DOC_Overview \ - -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \ - -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \ - -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \ - -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \ - -D BUILD_MODULE_FoundationClasses:BOOL=ON \ - -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \ - -D BUILD_MODULE_ModelingData:BOOL=$BUILD_MODULE_ModelingData \ - -D BUILD_MODULE_Visualization:BOOL=$BUILD_MODULE_Visualization \ - -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=$BUILD_RELEASE_DISABLE_EXCEPTIONS \ - -D BUILD_WITH_DEBUG:BOOL=$BUILD_WITH_DEBUG \ - -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=$BUILD_ENABLE_FPE_SIGNAL_HANDLER \ - -D INSTALL_DIR:PATH="$INSTALL_DIR" \ - -D INSTALL_DIR_LAYOUT:STRING=Windows \ - -D INSTALL_DIR_BIN:STRING=$INSTALL_DIR_BIN \ - -D INSTALL_DIR_LIB:STRING=$INSTALL_DIR_LIB \ - -D USE_FFMPEG:BOOL=$USE_FFMPEG \ - -D USE_FREEIMAGE:BOOL=$USE_FREEIMAGE \ - -D USE_GLES2:BOOL=$USE_GLES2 \ - -D USE_RAPIDJSON:BOOL=$USE_RAPIDJSON \ - -D USE_DRACO:BOOL=$USE_DRACO \ - -D USE_TBB:BOOL=$USE_TBB \ - -D USE_VTK:BOOL=$USE_VTK \ - $AUX_ARGS "$SrcRoot" - -popd diff --git a/adm/scripts/ios_build.sh b/adm/scripts/ios_build.sh deleted file mode 100755 index da49e989eb..0000000000 --- a/adm/scripts/ios_build.sh +++ /dev/null @@ -1,266 +0,0 @@ -#!/bin/bash - -# Auxiliary script for semi-automated building of OCCT for iOS platform. -# macos_custom.sh should be configured with paths to CMake and other 3rd-parties. -# FreeType should be specified as mandatory dependency. - -aScriptDir=${BASH_SOURCE%/*} -if [ -d "$aScriptDir" ]; then cd "$aScriptDir"; fi -aScriptDir="$PWD" - -aCasSrc=${aScriptDir}/../.. -aNbJobs="$(getconf _NPROCESSORS_ONLN)" - -export aBuildRoot=work - -# paths to pre-built 3rd-parties -export aFreeType= -export aFreeImage= -export aRapidJson= -export aDraco= - -# build stages to perform -export isStatic=1 -export toCMake=1 -export toClean=1 -export toMake=1 -export toInstall=1 -export toPack=0 -export toPackFat=0 -export toDebug=0 - -export BUILD_ModelingData=ON -export BUILD_ModelingAlgorithms=ON -export BUILD_Visualization=ON -export BUILD_ApplicationFramework=ON -export BUILD_DataExchange=ON - -export USE_FREETYPE=ON -export USE_FREEIMAGE=OFF -export USE_RAPIDJSON=OFF -export USE_DRACO=OFF - -export IPHONEOS_DEPLOYMENT_TARGET=8.0 -#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64" -export anAbiList="iPhoneOS|arm64" - -if [[ -f "${aScriptDir}/ios_custom.sh" ]]; then - source "${aScriptDir}/ios_custom.sh" -fi - -source "${aScriptDir}/build_common.sh" -aGitBranch=`git symbolic-ref --short HEAD` - -YEAR=$(date +"%Y") -MONTH=$(date +"%m") -DAY=$(date +"%d") -aRevision=-${YEAR}-${MONTH}-${DAY} -#aRevision=-${aGitBranch} - -set -o pipefail - -aBuildType="Release" -aBuildTypePrefix= -if [[ $toDebug == 1 ]]; then - aBuildType="Debug" - aBuildTypePrefix="-debug" -fi -aLibType="Shared" -if [[ $isStatic == 1 ]]; then - aLibType="Static" -fi - -function buildArch { - anAbi=$1 - aPlatformSdk=$2 - - aPlatformAndCompiler=${aPlatformSdk}-${anAbi}${aBuildTypePrefix}-clang - - aWorkDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}-make" - aDestDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}" - aLogFile="${aCasSrc}/${aBuildRoot}/build-${aPlatformAndCompiler}.log" - - if [[ $toCMake == 1 ]] && [[ $toClean == 1 ]]; then - rm -r -f "$aWorkDir" - rm -r -f "$aDestDir" - fi - mkdir -p "$aWorkDir" - mkdir -p "$aDestDir" - rm -f "$aLogFile" - - # include some information about OCCT into archive - echo \> "${aWorkDir}/VERSION.html" - git status >> "${aWorkDir}/VERSION.html" - git log -n 100 >> "${aWorkDir}/VERSION.html" - echo \>> "${aWorkDir}/VERSION.html" - - pushd "$aWorkDir" - - aTimeZERO=$SECONDS - - function logDuration { - if [[ $1 == 1 ]]; then - aDur=$(($4 - $3)) - echo $2 time: $aDur sec>> "$aLogFile" - fi - } - - aSysRoot="/Applications/Xcode.app/Contents/Developer/Platforms/${aPlatformSdk}.platform/Developer/SDKs/${aPlatformSdk}.sdk" - - # (re)generate Make files - if [[ $toCMake == 1 ]]; then - echo Configuring OCCT for iOS... - cmake -G "Unix Makefiles" \ - -D CMAKE_SYSTEM_NAME="iOS" \ - -D CMAKE_OSX_ARCHITECTURES:STRING="$anAbi" \ - -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="$IPHONEOS_DEPLOYMENT_TARGET" \ - -D CMAKE_OSX_SYSROOT:PATH="$aSysRoot" \ - -D CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS:BOOL="OFF" \ - -D CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS:BOOL="OFF" \ - -D CMAKE_BUILD_TYPE:STRING="$aBuildType" \ - -D BUILD_LIBRARY_TYPE:STRING="$aLibType" \ - -D INSTALL_DIR:PATH="$aDestDir" \ - -D INSTALL_DIR_INCLUDE:STRING="inc" \ - -D INSTALL_DIR_LIB:STRING="lib" \ - -D INSTALL_DIR_RESOURCE:STRING="src" \ - -D INSTALL_NAME_DIR:STRING="@executable_path/../Frameworks" \ - -D USE_FREETYPE:BOOL="$USE_FREETYPE" \ - -D 3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ - -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="$aFreeType/lib" \ - -D USE_RAPIDJSON:BOOL="$USE_RAPIDJSON" \ - -D 3RDPARTY_RAPIDJSON_DIR:PATH="$aRapidJson" \ - -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="$aRapidJson/include" \ - -D USE_DRACO:BOOL="$USE_DRACO" \ - -D 3RDPARTY_DRACO_DIR:PATH="$aDraco" \ - -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="$aDraco/include" \ - -D 3RDPARTY_DRACO_LIBRARY_DIR:PATH="$aDraco/lib" \ - -D USE_FREEIMAGE:BOOL="$USE_FREEIMAGE" \ - -D 3RDPARTY_FREEIMAGE_DIR:PATH="$aFreeImage" \ - -D 3RDPARTY_FREEIMAGE_INCLUDE_DIR:FILEPATH="$aFreeImage/include" \ - -D 3RDPARTY_FREEIMAGE_LIBRARY_DIR:PATH="$aFreeImage/lib" \ - -D 3RDPARTY_FREEIMAGE_LIBRARY:FILEPATH="$aFreeImage/lib/libfreeimage.a" \ - -D BUILD_MODULE_FoundationClasses:BOOL="ON" \ - -D BUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ - -D BUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ - -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \ - -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \ - -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \ - -D BUILD_MODULE_Draw:BOOL="OFF" \ - -D BUILD_DOC_Overview:BOOL="OFF" \ - "$aCasSrc" 2>&1 | tee -a "$aLogFile" - aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi - fi - aTimeGEN=$SECONDS - logDuration $toCMake "Generation" $aTimeZERO $aTimeGEN - - # clean up from previous build - if [[ $toClean == 1 ]]; then - make clean - fi - - # build the project - if [[ $toMake == 1 ]]; then - echo Building... - make -j $aNbJobs 2>&1 | tee -a "$aLogFile" - aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi - fi - aTimeBUILD=$SECONDS - logDuration $toMake "Building" $aTimeGEN $aTimeBUILD - logDuration $toMake "Total building" $aTimeZERO $aTimeBUILD - - # install the project - if [[ $toInstall == 1 ]]; then - echo Installing OCCT into $aDestDir... - make install 2>&1 | tee -a "$aLogFile" - cp -f "$aWorkDir/VERSION.html" "$aDestDir/VERSION.html" - echo Platform: ${aPlatformSdk} ABI: ${anAbi} Build: ${aBuildType} IPHONEOS_DEPLOYMENT_TARGET: ${IPHONEOS_DEPLOYMENT_TARGET} > "$aDestDir/build_target.txt" - fi - aTimeINSTALL=$SECONDS - logDuration $toInstall "Install" $aTimeBUILD $aTimeINSTALL - - # create an archive - if [[ $toPack == 1 ]]; then - anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aPlatformAndCompiler}.tar.bz2 - echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}... - rm ${aDestDir}/../${anArchName} &>/dev/null - pushd "$aDestDir" - tar -jcf ${aDestDir}/../${anArchName} * - popd - fi - aTimePACK=$SECONDS - logDuration $toPack "Packing archive" $aTimeINSTALL $aTimePACK - - # finished - DURATION=$(($aTimePACK - $aTimeZERO)) - echo Total time: $DURATION sec - logDuration 1 "Total" $aTimeZERO $aTimePACK - - popd -} - -for anArchIter in $anAbiList -do - IFS="|" read -r aPlatform anArch <<< "$anArchIter" - echo Platform: ${aPlatform} ABI: ${anArch} Build: ${aBuildType} - buildArch $anArch $aPlatform -done - -# create a FAT archive -if [[ $toPackFat == 1 ]]; then - for aPlatIter in iPhoneOS iPhoneSimulator - do - aSuffixFat=${aPlatIter}${aBuildTypePrefix}-clang - aFatDir="${aCasSrc}/${aBuildRoot}/${aSuffixFat}" - - # merge per-arch builds into fat builds - hasPlatform=0 - for anArchIter in $anAbiList - do - IFS="|" read -r aPlatform anArch <<< "$anArchIter" - if [[ $aPlatIter != ${aPlatform} ]]; then - continue - fi - - aSuffixThin=${aPlatform}-${anArch}${aBuildTypePrefix}-clang - anArchDir="${aCasSrc}/${aBuildRoot}/${aSuffixThin}" - if [[ $hasPlatform == 0 ]]; then - hasPlatform=1 - echo Packing FAT archive for platform: ${aPlatform} - rm -r -f "$aFatDir" - mkdir -p "$aFatDir" - rsync -r --exclude '*.a' "$anArchDir/" "$aFatDir" - rm -f "$aFatDir/build_target.txt" - for aLibIter in $anArchDir/lib/*.a; do - aLibName=`basename $aLibIter` - lipo "$anArchDir/lib/$aLibName" -output "$aFatDir/lib/$aLibName" -create - done - else - for aLibIter in $aFatDir/lib/*.a; do - aLibName=`basename $aLibIter` - lipo "$aFatDir/lib/$aLibName" "$anArchDir/lib/$aLibName" -output "$aFatDir/lib/$aLibName" -create - #lipo -info "$aFatDir/lib/$aLibName" - done - fi - cat "$anArchDir/build_target.txt" >> "$aFatDir/build_target.txt" - done - - # create an archive - for anArchIter in $anAbiList - do - IFS="|" read -r aPlatform anArch <<< "$anArchIter" - if [[ $aPlatIter != ${aPlatform} ]]; then - continue - fi - - anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aSuffixFat}.tar.bz2 - echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}... - rm ${aFatDir}/../${anArchName} &>/dev/null - pushd "$aFatDir" - tar -jcf ${aFatDir}/../${anArchName} * - popd - break - done - done -fi diff --git a/adm/scripts/ios_custom.sh.template b/adm/scripts/ios_custom.sh.template deleted file mode 100644 index c54624ebf6..0000000000 --- a/adm/scripts/ios_custom.sh.template +++ /dev/null @@ -1,30 +0,0 @@ -# environment configuration template for ios_build.sh (to be renamed as ios_custom_env.sh) -export PATH=/Applications/CMake.app/Contents/bin:$PATH -export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios" -export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios" -export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0" -export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios" - -# Uncomment to customize building steps -#export isStatic=0 -#export toCMake=1 -#export toClean=1 -#export toMake=1 -#export toInstall=1 -#export toPack=0 -#export toPackFat=1 -#export toDebug=0 - -#export BUILD_ModelingData=ON -#export BUILD_ModelingAlgorithms=ON -#export BUILD_Visualization=ON -#export BUILD_ApplicationFramework=ON -#export BUILD_DataExchange=ON - -#export USE_RAPIDJSON=ON -#export USE_DRACO=ON -#export USE_FREEIMAGE=ON - -#export IPHONEOS_DEPLOYMENT_TARGET=8.0 -#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64" -#export anAbiList="iPhoneOS|arm64" diff --git a/adm/scripts/macos_build.sh b/adm/scripts/macos_build.sh deleted file mode 100755 index 65b7a62adc..0000000000 --- a/adm/scripts/macos_build.sh +++ /dev/null @@ -1,267 +0,0 @@ -#!/bin/bash - -# Auxiliary script for semi-automated building of OCCT for macOS platform. -# macos_custom.sh should be configured with paths to CMake and other 3rd-parties. -# FreeType should be specified as mandatory dependency. - -aScriptDir=${BASH_SOURCE%/*} -if [ -d "$aScriptDir" ]; then cd "$aScriptDir"; fi -aScriptDir="$PWD" - -aCasSrc=${aScriptDir}/../.. -aNbJobs="$(getconf _NPROCESSORS_ONLN)" - -export aBuildRoot=work - -# paths to pre-built 3rd-parties -export aFreeType= -export aFreeImage= -export aRapidJson= -export aDraco= - -# build stages to perform -export isStatic=0 -export toCMake=1 -export toClean=1 -export toMake=1 -export toInstall=1 -export toPack=0 -export toPackFat=0 -export toDebug=0 - -export BUILD_ModelingData=ON -export BUILD_ModelingAlgorithms=ON -export BUILD_Visualization=ON -export BUILD_ApplicationFramework=ON -export BUILD_DataExchange=ON -export BUILD_Draw=ON - -export USE_FREETYPE=ON -export USE_FREEIMAGE=ON -export USE_RAPIDJSON=OFF -export USE_DRACO=OFF - -export MACOSX_DEPLOYMENT_TARGET=10.10 -#export anAbiList="arm64 x86_64" -export anAbiList="x86_64" -aPlatform="macos" - -if [[ -f "${aScriptDir}/macos_custom.sh" ]]; then - source "${aScriptDir}/macos_custom.sh" -fi - -source "${aScriptDir}/build_common.sh" -aGitBranch=`git symbolic-ref --short HEAD` - -YEAR=$(date +"%Y") -MONTH=$(date +"%m") -DAY=$(date +"%d") -aRevision=-${YEAR}-${MONTH}-${DAY} -#aRevision=-${aGitBranch} - -set -o pipefail - -aBuildType="Release" -aBuildTypePrefix= -if [[ $toDebug == 1 ]]; then - aBuildType="Debug" - aBuildTypePrefix="-debug" -fi -aLibType="Shared" -aLibExt="dylib" -if [[ $isStatic == 1 ]]; then - aLibType="Static" - aLibExt="a" -fi - -function buildArch { - anAbi=$1 - - aPlatformAndCompiler=${aPlatform}-${anAbi}${aBuildTypePrefix}-clang - - aWorkDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}-make" - aDestDir="${aCasSrc}/${aBuildRoot}/${aPlatformAndCompiler}" - aLogFile="${aCasSrc}/${aBuildRoot}/build-${aPlatformAndCompiler}.log" - - if [[ $toCMake == 1 ]] && [[ $toClean == 1 ]]; then - rm -r -f "$aWorkDir" - rm -r -f "$aDestDir" - fi - mkdir -p "$aWorkDir" - mkdir -p "$aDestDir" - rm -f "$aLogFile" - - # include some information about OCCT into archive - echo \> "${aWorkDir}/VERSION.html" - git status >> "${aWorkDir}/VERSION.html" - git log -n 100 >> "${aWorkDir}/VERSION.html" - echo \>> "${aWorkDir}/VERSION.html" - - pushd "$aWorkDir" - - aTimeZERO=$SECONDS - - function logDuration { - if [[ $1 == 1 ]]; then - aDur=$(($4 - $3)) - echo $2 time: $aDur sec>> "$aLogFile" - fi - } - - # (re)generate Make files - if [[ $toCMake == 1 ]]; then - echo Configuring OCCT for macOS... - cmake -G "Unix Makefiles" \ - -D CMAKE_OSX_ARCHITECTURES:STRING="$anAbi" \ - -D CMAKE_BUILD_TYPE:STRING="$aBuildType" \ - -D BUILD_LIBRARY_TYPE:STRING="$aLibType" \ - -D INSTALL_DIR:PATH="$aDestDir" \ - -D INSTALL_DIR_INCLUDE:STRING="inc" \ - -D INSTALL_DIR_LIB:STRING="lib" \ - -D INSTALL_DIR_RESOURCE:STRING="src" \ - -D INSTALL_NAME_DIR:STRING="@executable_path/../Frameworks" \ - -D USE_FREETYPE:BOOL="$USE_FREETYPE" \ - -D 3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ - -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="$aFreeType/lib" \ - -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="$aFreeType/lib/libfreetype.dylib" \ - -D USE_RAPIDJSON:BOOL="$USE_RAPIDJSON" \ - -D 3RDPARTY_RAPIDJSON_DIR:PATH="$aRapidJson" \ - -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="$aRapidJson/include" \ - -D USE_DRACO:BOOL="$USE_DRACO" \ - -D 3RDPARTY_DRACO_DIR:PATH="$aDraco" \ - -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="$aDraco/include" \ - -D 3RDPARTY_DRACO_LIBRARY_DIR:PATH="$aDraco/lib" \ - -D USE_FREEIMAGE:BOOL="$USE_FREEIMAGE" \ - -D 3RDPARTY_FREEIMAGE_DIR:PATH="$aFreeImage" \ - -D 3RDPARTY_FREEIMAGE_INCLUDE_DIR:FILEPATH="$aFreeImage/include" \ - -D 3RDPARTY_FREEIMAGE_LIBRARY_DIR:PATH="$aFreeImage/lib" \ - -D 3RDPARTY_FREEIMAGE_LIBRARY:FILEPATH="$aFreeImage/lib/libfreeimage.a" \ - -D BUILD_MODULE_FoundationClasses:BOOL="ON" \ - -D BUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ - -D BUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ - -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \ - -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \ - -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \ - -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \ - -D BUILD_DOC_Overview:BOOL="OFF" \ - "$aCasSrc" 2>&1 | tee -a "$aLogFile" - aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi - fi - aTimeGEN=$SECONDS - logDuration $toCMake "Generation" $aTimeZERO $aTimeGEN - - # clean up from previous build - if [[ $toClean == 1 ]]; then - make clean - fi - - # build the project - if [[ $toMake == 1 ]]; then - echo Building OCCT... - make -j $aNbJobs 2>&1 | tee -a "$aLogFile" - aResult=$?; if [[ $aResult != 0 ]]; then exit $aResult; fi - fi - aTimeBUILD=$SECONDS - logDuration $toMake "Building" $aTimeGEN $aTimeBUILD - logDuration $toMake "Total building" $aTimeZERO $aTimeBUILD - - # install the project - if [[ $toInstall == 1 ]]; then - echo Installing OCCT into $aDestDir... - make install 2>&1 | tee -a "$aLogFile" - cp -f "$aWorkDir/VERSION.html" "$aDestDir/VERSION.html" - echo Platform: macOS ABI: ${anAbi} Build: ${aBuildType} MACOSX_DEPLOYMENT_TARGET: ${MACOSX_DEPLOYMENT_TARGET} > "$aDestDir/build_target.txt" - fi - aTimeINSTALL=$SECONDS - logDuration $toInstall "Install" $aTimeBUILD $aTimeINSTALL - - # create an archive - if [[ $toPack == 1 ]]; then - anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aPlatformAndCompiler}.tar.bz2 - echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}... - rm ${aDestDir}/../${anArchName} &>/dev/null - pushd "$aDestDir" - tar -jcf ${aDestDir}/../${anArchName} * - popd - fi - aTimePACK=$SECONDS - logDuration $toPack "Packing archive" $aTimeINSTALL $aTimePACK - - # finished - DURATION=$(($aTimePACK - $aTimeZERO)) - echo Total time: $DURATION sec - logDuration 1 "Total" $aTimeZERO $aTimePACK - - popd -} - -for anArchIter in $anAbiList -do - echo Platform: macOS ABI: ${anArchIter} Build: ${aBuildType} - buildArch $anArchIter -done - -# create a FAT archive -if [[ $toPackFat == 1 ]]; then - aSuffixFat=${aPlatform}${aBuildTypePrefix}-clang - aFatDir="${aCasSrc}/${aBuildRoot}/${aSuffixFat}" - - # merge per-arch builds into fat builds - hasPlatform=0 - for anArchIter in $anAbiList - do - aSuffixThin=${aPlatform}-${anArchIter}${aBuildTypePrefix}-clang - anArchDir="${aCasSrc}/${aBuildRoot}/${aSuffixThin}" - if [[ $hasPlatform == 0 ]]; then - hasPlatform=1 - echo Packing FAT archive - rm -r -f "$aFatDir" - mkdir -p "$aFatDir" - if [[ $isStatic == 1 ]]; then - rsync -r -l --exclude '*.a' "$anArchDir/" "$aFatDir" - else - rsync -r -l --exclude '*.dylib' "$anArchDir/" "$aFatDir" - fi - rm -f "$aFatDir/build_target.txt" - - if [[ -L "$anArchDir/bin/DRAWEXE" ]]; then - aDrawExe=$(readlink "$anArchDir/bin/DRAWEXE") - rm $aFatDir/bin/$aDrawExe - lipo "$anArchDir/bin/$aDrawExe" -output "$aFatDir/bin/$aDrawExe" -create - fi - - for aLibIter in $anArchDir/lib/*.$aLibExt; do - aLibName=`basename $aLibIter` - if [[ -L "$anArchDir/lib/$aLibName" ]]; then - cp -a "$anArchDir/lib/$aLibName" "$aFatDir/lib/" - else - lipo "$anArchDir/lib/$aLibName" -output "$aFatDir/lib/$aLibName" -create - fi - done - else - if [[ -L "$anArchDir/bin/DRAWEXE" ]]; then - aDrawExe=$(readlink "$anArchDir/bin/DRAWEXE") - lipo "$aFatDir/bin/$aDrawExe" "$anArchDir/bin/$aDrawExe" -output "$aFatDir/bin/$aDrawExe" -create - fi - - for aLibIter in $aFatDir/lib/*.$aLibExt; do - aLibName=`basename $aLibIter` - if [[ ! -L "$anArchDir/lib/$aLibName" ]]; then - lipo "$aFatDir/lib/$aLibName" "$anArchDir/lib/$aLibName" -output "$aFatDir/lib/$aLibName" -create - #lipo -info "$aFatDir/lib/$aLibName" - fi - done - fi - cat "$anArchDir/build_target.txt" >> "$aFatDir/build_target.txt" - done - - # create an archive - anArchName=occt-${anOcctVersion}${anOcctVerSuffix}${aRevision}-${aSuffixFat}.tar.bz2 - echo Creating an archive ${aCasSrc}/${aBuildRoot}/${anArchName}... - rm ${aFatDir}/../${anArchName} &>/dev/null - pushd "$aFatDir" - tar -jcf ${aFatDir}/../${anArchName} * - popd -fi diff --git a/adm/scripts/macos_custom.sh.template b/adm/scripts/macos_custom.sh.template deleted file mode 100644 index 740c24f640..0000000000 --- a/adm/scripts/macos_custom.sh.template +++ /dev/null @@ -1,31 +0,0 @@ -# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh) -export PATH=/Applications/CMake.app/Contents/bin:$PATH -export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos" -export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos" -export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0" -export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos" - -# Uncomment to customize building steps -#export aBuildRoot=work -#export toCMake=1 -#export toClean=1 -#export toMake=1 -#export toInstall=1 -#export toPack=1 -#export toPackFat=1 - -#export BUILD_ModelingData=ON -#export BUILD_ModelingAlgorithms=ON -#export BUILD_Visualization=ON -#export BUILD_ApplicationFramework=ON -#export BUILD_DataExchange=ON -#export BUILD_Draw=ON - -#export USE_RAPIDJSON=ON -#export USE_DRACO=ON -#export USE_FREEIMAGE=ON - -#export MACOSX_DEPLOYMENT_TARGET=10.10 -#export anAbiList=arm64 -#export anAbiList=x86_64 -#export anAbiList="arm64 x86_64" diff --git a/adm/scripts/mingw_build.bat b/adm/scripts/mingw_build.bat deleted file mode 100644 index 886f5dc597..0000000000 --- a/adm/scripts/mingw_build.bat +++ /dev/null @@ -1,266 +0,0 @@ -@echo OFF - -rem Auxiliary script for semi-automated building of OCCT for Mingw-w64 platform. -rem mingw_custom.bat should be configured with paths to CMake, 3rd-parties and MinGW. - -set "aCasSrc=%~dp0..\.." -set "aBuildRoot=%aCasSrc%\work" - -set aNbJobs=%NUMBER_OF_PROCESSORS% - -rem Paths to 3rd-party tools and libraries -set "aCmakeBin=" -set "aMingwVars=" -set "aFreeType=" -set "aFreeImage=" -set "aRapidJson=" -set "aDraco=" -set "aTclTk=" - -rem Build stages to perform -set "toCMake=1" -set "toClean=0" -set "toMake=1" -set "toInstall=1" -set "toPack=0" -set "toDebug=0" -set "isStatic=0" - -rem OCCT Modules to build -set "BUILD_ModelingData=ON" -set "BUILD_ModelingAlgorithms=ON" -set "BUILD_Visualization=ON" -set "BUILD_ApplicationFramework=ON" -set "BUILD_DataExchange=ON" -set "BUILD_Draw=ON" - -rem Optional 3rd-party libraries to enable -set "USE_FREETYPE=ON" -set "USE_RAPIDJSON=OFF" -set "USE_DRACO=OFF" -set "USE_FREEIMAGE=ON" - -rem Archive tool -set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" -set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe" - -rem Configuration file -if exist "%~dp0mingw_custom.bat" call "%~dp0mingw_custom.bat" - -if not ["%aMingwVars%"] == [""] ( call "%aMingwVars%" ) -if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" ) - -set "anOcctVerSuffix=" -set "anOcctVersion=0.0.0" -call "%~dp0build_common.bat" -set "aGitBranch=" -for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" ) - -set "aBuildType=Release" -set "aBuildTypePrefix=" -set "aLibType=Shared" -if ["%isStatic%"] == ["1"] set "aLibType=Static" -if ["%toDebug%"] == ["1"] ( - set "aBuildType=Debug" - set "aBuildTypePrefix=-debug" -) - -call :cmakeGenerate -if errorlevel 1 ( - if not ["%1"] == ["-nopause"] ( - pause - ) - exit /B 1 - goto :eof -) - -for /F "skip=1 delims=" %%F in (' - wmic PATH Win32_LocalTime GET Day^,Month^,Year /FORMAT:TABLE -') do ( - for /F "tokens=1-3" %%L in ("%%F") do ( - set DAY00=0%%L - set MONTH00=0%%M - set YEAR=%%N - ) -) -set DAY00=%DAY00:~-2% -set MONTH00=%MONTH00:~-2% -set "aRevision=-%YEAR%-%MONTH00%-%DAY00%" -rem set "aRevision=-%aGitBranch%" -set "anArchName=occt-%anOcctVersion%%anOcctVerSuffix%%aRevision%-mingw64%aBuildTypePrefix%" -set "aTarget=%aBuildRoot%\%anArchName%" -if ["%toPack%"] == ["1"] ( - echo Creating archive %anArchName%.7z - rmdir /S /Q "%aTarget%" - if not exist "%aTarget%" ( mkdir "%aTarget%" ) - if exist "%aBuildRoot%/%anArchName%.7z" del "%aBuildRoot%/%anArchName%.7z" - xcopy /S /Y "%aDestDir%\*" "%aTarget%\" - - echo Copying dependencies... - for %%i in (libstdc++-6.dll libwinpthread-1.dll libgcc_s_seh-1.dll) do ( - if "%%~$PATH:i" == "" ( - echo "Error: could not find %%i" - ) else ( - xcopy /Y "%%~$PATH:i" "%aTarget%\win64\gcc\bin" - ) - ) - - "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%" -) -if not ["%1"] == ["-nopause"] ( - pause -) - -goto :eof - -:cmakeGenerate -set "aPlatformAndCompiler=mingw64%aBuildTypePrefix%" -set "aWorkDir=%aBuildRoot%\occt-%aPlatformAndCompiler%-make" -set "aDestDir=%aBuildRoot%\occt-%aPlatformAndCompiler%" -set "aLogFile=%aBuildRoot%\occt-%aPlatformAndCompiler%-build.log" -if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aWorkDir%" - rmdir /S /Q %aDestDir%" - ) -) -if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" ) -if exist "%aLogFile%" ( del "%aLogFile%" ) - -rem include some information about OCCT into archive -echo ^> "%aWorkDir%\VERSION.html" -git status >> "%aWorkDir%\VERSION.html" -git log -n 100 >> "%aWorkDir%\VERSION.html" -echo ^>> "%aWorkDir%\VERSION.html" - -echo Start building OCCT for %aPlatformAndCompiler% -echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile% - -pushd "%aWorkDir%" - -set "aTimeZERO=%TIME%" -if ["%toCMake%"] == ["1"] ( - echo Configuring OCCT for MinGW-w64... - cmake -G "MinGW Makefiles" ^ - -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^ - -D BUILD_LIBRARY_TYPE:STRING="%aLibType%" ^ - -D INSTALL_DIR:PATH="%aDestDir%" ^ - -D INSTALL_DIR_INCLUDE:STRING="inc" ^ - -D INSTALL_DIR_RESOURCE:STRING="src" ^ - -D BUILD_DOC_Overview:BOOL="OFF" ^ - -D BUILD_MODULE_FoundationClasses:BOOL="ON" ^ - -D BUILD_MODULE_ModelingData:BOOL="%BUILD_ModelingData%" ^ - -D BUILD_MODULE_ModelingAlgorithms:BOOL="%BUILD_ModelingAlgorithms%" ^ - -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^ - -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^ - -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^ - -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^ - -D 3RDPARTY_TCL_DIR:PATH="%aTclTk%" ^ - -D 3RDPARTY_TCL_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^ - -D 3RDPARTY_TCL_LIBRARY_DIR:PATH="%aTclTk%/lib" ^ - -D 3RDPARTY_TCL_DLL_DIR:PATH="%aTclTk%/bin" ^ - -D 3RDPARTY_TK_DIR:PATH="%aTclTk%" ^ - -D 3RDPARTY_TK_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^ - -D 3RDPARTY_TK_LIBRARY_DIR:PATH="%aTclTk%/lib" ^ - -D 3RDPARTY_TK_DLL_DIR:PATH="%aTclTk%/bin" ^ - -D USE_D3D:BOOL="ON" ^ - -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^ - -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^ - -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="%aFreeType%/lib" ^ - -D USE_FREEIMAGE:BOOL="%USE_FREEIMAGE%" ^ - -D 3RDPARTY_FREEIMAGE_DIR:PATH="%aFreeImage%" ^ - -D 3RDPARTY_FREEIMAGE_INCLUDE_DIR:FILEPATH="%aFreeImage%/include" ^ - -D 3RDPARTY_FREEIMAGE_LIBRARY_DIR:PATH="%aFreeImage%/lib" ^ - -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^ - -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^ - -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^ - -D USE_DRACO:BOOL="%USE_DRACO%" ^ - -D 3RDPARTY_DRACO_DIR:PATH="%aDraco%" ^ - -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="%aDraco%/include" ^ - -D 3RDPARTY_DRACO_LIBRARY_DIR:PATH="%aDraco%/lib" ^ - "%aCasSrc%" - - if errorlevel 1 ( - popd - exit /B 1 - goto :eof - ) -) -set "aTimeGEN=%TIME%" -call :computeDuration %aTimeZERO% %aTimeGEN% -if ["%toCMake%"] == ["1"] ( - echo Generation time: %DURATION% - echo Generation time: %DURATION%>> "%aLogFile%" -) - -if ["%toClean%"] == ["1"] ( - mingw32-make clean -) - -if ["%toMake%"] == ["1"] ( - echo Building... - mingw32-make -j %aNbJobs% 2>> "%aLogFile%" - if errorlevel 1 ( - type "%aLogFile%" - popd - exit /B 1 - goto :eof - ) - type "%aLogFile%" -) -set "aTimeBUILD=%TIME%" -call :computeDuration %aTimeGEN% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Building time: %DURATION% - echo Building time: %DURATION%>> "%aLogFile%" -) -call :computeDuration %aTimeZERO% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Total building time: %DURATION% - echo Total building time: %DURATION%>> "%aLogFile%" -) - -if ["%toInstall%"] == ["1"] ( - echo Installing into %aDestDir%... - mingw32-make install 2>> "%aLogFile%" - copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html" -) -set "aTimeINSTALL=%TIME%" -call :computeDuration "%aTimeBUILD%" "%aTimeINSTALL%" -if ["%toInstall%"] == ["1"] ( - echo Install time: %DURATION% - echo Install time: %DURATION%>> "%aLogFile%" -) - -call :computeDuration "%aTimeZERO%" "%aTimeINSTALL%" -echo Total time: %DURATION% -echo Total time: %DURATION%>> "%aLogFile%" - -popd -goto :eof - -:computeDuration -set "aTimeFrom=%~1" -set "aTimeEnd=%~2" -rem handle time before 10AM (win10 - remove empty space at the beginning) -if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%" -if "%aTimeEnd:~0,1%"==" " set "aTimeEnd=%aTimeEnd:~1%" -rem handle time before 10AM (win7 - add 0 at the beginning) -if "%aTimeFrom:~1,1%"==":" set "aTimeFrom=0%aTimeFrom%" -if "%aTimeEnd:~1,1%"==":" set "aTimeEnd=0%aTimeEnd%" -rem convert hours:minutes:seconds:ms into duration -set /A aTimeFrom=(1%aTimeFrom:~0,2%-100)*360000 + (1%aTimeFrom:~3,2%-100)*6000 + (1%aTimeFrom:~6,2%-100)*100 + (1%aTimeFrom:~9,2%-100) -set /A aTimeEnd= (1%aTimeEnd:~0,2%-100)*360000 + (1%aTimeEnd:~3,2%-100)*6000 + (1%aTimeEnd:~6,2%-100)*100 + (1%aTimeEnd:~9,2%-100) -set /A aDurTotalSec=%aTimeEnd%-%aTimeFrom% -if %aTimeEnd% LSS %aTimeFrom% set set /A aDurTotalSec=%aTimeFrom%-%aTimeEnd% -set /A aDurHH=%aDurTotalSec% / 360000 -set /A aDurMM=(%aDurTotalSec% - %aDurHH%*360000) / 6000 -set /A aDurSS=(%aDurTotalSec% - %aDurHH%*360000 - %aDurMM%*6000) / 100 -if %aDurHH% LSS 10 set aDurHH=0%aDurHH% -if %aDurMM% LSS 10 set aDurMM=0%aDurMM% -if %aDurSS% LSS 10 set aDurSS=0%aDurSS% - -set "DURATION=%aDurHH%:%aDurMM%:%aDurSS%" -goto :eof diff --git a/adm/scripts/mingw_custom.bat.template b/adm/scripts/mingw_custom.bat.template deleted file mode 100644 index 0a7f6c6750..0000000000 --- a/adm/scripts/mingw_custom.bat.template +++ /dev/null @@ -1,29 +0,0 @@ -rem Environment configuration template for mingw_build.bat (to be renamed as mingw_custom.bat) -set "aCmakeBin=%ProgramW6432%\CMake\bin" -set "aFreeType=%aCasSrc%/../3rdparty/freetype-2.6.3-mingw-64" -set "aTclTk=%aCasSrc%/../3rdparty/tcltk-8.6.4-mingw-64" -set "aFreeImage=%aCasSrc%/../3rdparty/freeimage-3.17-0-mingw-64" -set "aRapidJson=%aCasSrc%/../3rdparty/rapidjson-1.1.0" -set "aDraco=%aCasSrc%/../3rdparty/draco-1.4-1-mingw-64" - -set "aMingwVars=c:\mingw-8.3.0-msys2\mingwvars.bat" - -rem Uncomment to customize building steps -rem set "aBuildRoot=work" -rem set "toCMake=1" -rem set "toClean=1" -rem set "toMake=1" -rem set "toInstall=1" -rem set "toPack=1" -rem set "toDebug=0" - -rem set "BUILD_ModelingData=ON" -rem set "BUILD_ModelingAlgorithms=ON" -rem set "BUILD_Visualization=ON" -rem set "BUILD_ApplicationFramework=ON" -rem set "BUILD_DataExchange=ON" -rem set "BUILD_Draw=ON" - -rem set "USE_RAPIDJSON=ON" -rem set "USE_DRACO=ON" -rem set "USE_FREEIMAGE=ON" diff --git a/adm/scripts/wasm_build.bat b/adm/scripts/wasm_build.bat deleted file mode 100644 index 24d85c4f40..0000000000 --- a/adm/scripts/wasm_build.bat +++ /dev/null @@ -1,333 +0,0 @@ -@echo OFF - -rem Auxiliary script for semi-automated building of OCCT for WASM platform. -rem wasm_custom.bat should be configured with paths to CMake, 3rd-parties and Emscripten SDK. -rem FreeType should be specified as mandatory dependency. - -set "aCasSrc=%~dp0..\.." -set "aBuildRoot=%aCasSrc%\work" - -set aNbJobs=%NUMBER_OF_PROCESSORS% - -rem Paths to 3rd-party tools and libraries -set "aCmakeBin=" -set "aFreeType=" -set "aRapidJson=" -set "aDraco=" -set "aTcl=" - -rem Build stages to perform -set "toCMake=1" -set "toClean=0" -set "toMake=1" -set "toInstall=1" -set "toPack=0" -set "toDebug=0" -set "toBuildSample=0" -set "sourceMapBase=" - -rem OCCT Modules to build -set "BUILD_ModelingData=ON" -set "BUILD_ModelingAlgorithms=ON" -set "BUILD_Visualization=ON" -set "BUILD_ApplicationFramework=ON" -set "BUILD_DataExchange=ON" -set "BUILD_Draw=OFF" - -rem Optional 3rd-party libraries to enable -set "USE_FREETYPE=ON" -set "USE_RAPIDJSON=OFF" -set "USE_DRACO=OFF" -set "USE_PTHREADS=OFF" - -rem Archive tool -set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on" -set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe" - -rem Configuration file -if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat" - -call "%EMSDK_ROOT%\emsdk_env.bat" -set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" -if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" ) - -set "anOcctVerSuffix=" -set "anOcctVersion=0.0.0" -set "aGitBranch=" -call "%~dp0build_common.bat" -set "aGitBranch=" -for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" ) - -set "aBuildType=Release" -set "aBuildTypePrefix=" -set "anExtraCxxFlags=" -if /I ["%USE_PTHREADS%"] == ["ON"] ( - set "anExtraCxxFlags=-pthread" - set "aBuildTypePrefix=%aBuildTypePrefix%-pthread" -) -if ["%toDebug%"] == ["1"] ( - set "aBuildType=Debug" - set "aBuildTypePrefix=%aBuildTypePrefix%-debug" -) - -call :cmakeGenerate -if errorlevel 1 ( - if not ["%1"] == ["-nopause"] ( - pause - ) - exit /B 1 - goto :eof -) - -for /F "skip=1 delims=" %%F in (' - wmic PATH Win32_LocalTime GET Day^,Month^,Year /FORMAT:TABLE -') do ( - for /F "tokens=1-3" %%L in ("%%F") do ( - set DAY00=0%%L - set MONTH00=0%%M - set YEAR=%%N - ) -) -set DAY00=%DAY00:~-2% -set MONTH00=%MONTH00:~-2% -set "aRevision=-%YEAR%-%MONTH00%-%DAY00%" -rem set "aRevision=-%aGitBranch%" -set "anArchName=occt-%anOcctVersion%%anOcctVerSuffix%%aRevision%-wasm32%aBuildTypePrefix%" -set "aTarget=%aBuildRoot%\%anArchName%" -if ["%toPack%"] == ["1"] ( - echo Creating archive %anArchName%.7z - rmdir /S /Q "%aTarget%" - if not exist "%aTarget%" ( mkdir "%aTarget%" ) - if exist "%aBuildRoot%/%anArchName%.7z" del "%aBuildRoot%/%anArchName%.7z" - xcopy /S /Y "%aDestDir%\*" "%aTarget%\" - - if ["%toBuildSample%"] == ["1"] ( - if not exist "%aTarget%\sample" ( mkdir "%aTarget%\sample" ) - xcopy /S /Y "%aDestDirSmpl%\*" "%aTarget%\sample\" - ) - - "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%" -) -if not ["%1"] == ["-nopause"] ( - pause -) - -goto :eof - -:cmakeGenerate -set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%" -set "aWorkDir=%aBuildRoot%\occt-%aPlatformAndCompiler%-make" -set "aDestDir=%aBuildRoot%\occt-%aPlatformAndCompiler%" -set "aLogFile=%aBuildRoot%\occt-%aPlatformAndCompiler%-build.log" -if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aWorkDir%" - rmdir /S /Q %aDestDir%" - ) -) -if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" ) -if exist "%aLogFile%" ( del "%aLogFile%" ) - -set "aSrcRootSmpl=%aCasSrc%\samples\webgl" -set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make" -set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%" -set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log" -if ["%toBuildSample%"] == ["1"] ( - if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aWorkDirSmpl%" - rmdir /S /Q %aDestDirSmpl%" - ) - ) - if not exist "%aWorkDirSmpl%" ( mkdir "%aWorkDirSmpl%" ) - if exist "%aLogFileSmpl%" ( del "%aLogFileSmpl%" ) -) - -rem include some information about OCCT into archive -echo ^> "%aWorkDir%\VERSION.html" -git status >> "%aWorkDir%\VERSION.html" -git log -n 100 >> "%aWorkDir%\VERSION.html" -echo ^>> "%aWorkDir%\VERSION.html" - -echo Start building OCCT for %aPlatformAndCompiler% -echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile% - -echo --->> %aLogFile% -call emcc --version >> %aLogFile% -echo --->> %aLogFile% - -pushd "%aWorkDir%" - -set "aTimeZERO=%TIME%" -if ["%toCMake%"] == ["1"] ( - echo Configuring OCCT for WASM... - cmake -G "MinGW Makefiles" ^ - -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^ - -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^ - -D BUILD_LIBRARY_TYPE:STRING="Static" ^ - -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^ - -D INSTALL_DIR:PATH="%aDestDir%" ^ - -D INSTALL_DIR_INCLUDE:STRING="inc" ^ - -D INSTALL_DIR_RESOURCE:STRING="src" ^ - -D BUILD_MODULE_FoundationClasses:BOOL="ON" ^ - -D BUILD_MODULE_ModelingData:BOOL="%BUILD_ModelingData%" ^ - -D BUILD_MODULE_ModelingAlgorithms:BOOL="%BUILD_ModelingAlgorithms%" ^ - -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^ - -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^ - -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^ - -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^ - -D BUILD_DOC_Overview:BOOL="OFF" ^ - -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^ - -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^ - -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^ - -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^ - -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^ - -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^ - -D USE_DRACO:BOOL="%USE_DRACO%" ^ - -D 3RDPARTY_DRACO_DIR:PATH="%aDraco%" ^ - -D 3RDPARTY_DRACO_INCLUDE_DIR:FILEPATH="%aDraco%/include" ^ - -D 3RDPARTY_DRACO_LIBRARY_DIR:PATH="%aDraco%/lib" ^ - -D 3RDPARTY_DRACO_LIBRARY:FILEPATH="%aDraco%/lib/libdraco.a" ^ - -D USE_TK:BOOL="OFF" ^ - -D 3RDPARTY_TCL_DIR:PATH="%aTcl%" ^ - -D 3RDPARTY_TCL_INCLUDE_DIR:PATH="%aTcl%/include" ^ - -D 3RDPARTY_TCL_LIBRARY_DIR:PATH="%aTcl%/lib" ^ - -D 3RDPARTY_TCL_LIBRARY:FILEPATH="%aTcl%/lib/libtcl.a" ^ - "%aCasSrc%" - - if errorlevel 1 ( - popd - exit /B 1 - goto :eof - ) -) -set "aTimeGEN=%TIME%" -call :computeDuration %aTimeZERO% %aTimeGEN% -if ["%toCMake%"] == ["1"] ( - echo Generation time: %DURATION% - echo Generation time: %DURATION%>> "%aLogFile%" -) - -if ["%toClean%"] == ["1"] ( - mingw32-make clean -) - -if ["%toMake%"] == ["1"] ( - echo Building... - mingw32-make -j %aNbJobs% 2>> "%aLogFile%" - if errorlevel 1 ( - type "%aLogFile%" - popd - exit /B 1 - goto :eof - ) - type "%aLogFile%" -) -set "aTimeBUILD=%TIME%" -call :computeDuration %aTimeGEN% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Building time: %DURATION% - echo Building time: %DURATION%>> "%aLogFile%" -) -call :computeDuration %aTimeZERO% %aTimeBUILD% -if ["%toMake%"] == ["1"] ( - echo Total building time: %DURATION% - echo Total building time: %DURATION%>> "%aLogFile%" -) - -if ["%toInstall%"] == ["1"] ( - echo Installing into %aDestDir%... - mingw32-make install 2>> "%aLogFile%" - copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html" -) -set "aTimeINSTALL=%TIME%" -call :computeDuration "%aTimeBUILD%" "%aTimeINSTALL%" -if ["%toInstall%"] == ["1"] ( - echo Install time: %DURATION% - echo Install time: %DURATION%>> "%aLogFile%" -) - -call :computeDuration "%aTimeZERO%" "%aTimeINSTALL%" -echo Total time: %DURATION% -echo Total time: %DURATION%>> "%aLogFile%" - -popd -if ["%toBuildSample%"] == ["0"] ( - goto :eof -) - -pushd "%aWorkDirSmpl%" - -if ["%toCMake%"] == ["1"] ( - cmake -G "MinGW Makefiles" ^ - -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^ - -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^ - -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^ - -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^ - -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^ - -D OpenCASCADE_DIR:PATH="%aDestDir%/lib/cmake/opencascade" ^ - -D freetype_DIR:PATH="%aFreeType%/lib/cmake/freetype" ^ - "%aSrcRootSmpl%" - - if errorlevel 1 ( - popd - pause - exit /B - goto :eof - ) -) -if ["%toClean%"] == ["1"] ( - mingw32-make clean -) - -if ["%toMake%"] == ["1"] ( - echo Building... - mingw32-make -j %aNbJobs% 2>> "%aLogFileSmpl%" - if errorlevel 1 ( - type "%aLogFileSmpl%" - popd - pause - exit /B - goto :eof - ) - type "%aLogFileSmpl%" -) - -if ["%toInstall%"] == ["1"] ( - mingw32-make install 2>> "%aLogFileSmpl%" - if errorlevel 1 ( - type "%aLogFileSmpl%" - popd - pause - exit /B - goto :eof - ) -) -popd - -goto :eof - -:computeDuration -set "aTimeFrom=%~1" -set "aTimeEnd=%~2" -rem handle time before 10AM (win10 - remove empty space at the beginning) -if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%" -if "%aTimeEnd:~0,1%"==" " set "aTimeEnd=%aTimeEnd:~1%" -rem handle time before 10AM (win7 - add 0 at the beginning) -if "%aTimeFrom:~1,1%"==":" set "aTimeFrom=0%aTimeFrom%" -if "%aTimeEnd:~1,1%"==":" set "aTimeEnd=0%aTimeEnd%" -rem convert hours:minutes:seconds:ms into duration -set /A aTimeFrom=(1%aTimeFrom:~0,2%-100)*360000 + (1%aTimeFrom:~3,2%-100)*6000 + (1%aTimeFrom:~6,2%-100)*100 + (1%aTimeFrom:~9,2%-100) -set /A aTimeEnd= (1%aTimeEnd:~0,2%-100)*360000 + (1%aTimeEnd:~3,2%-100)*6000 + (1%aTimeEnd:~6,2%-100)*100 + (1%aTimeEnd:~9,2%-100) -set /A aDurTotalSec=%aTimeEnd%-%aTimeFrom% -if %aTimeEnd% LSS %aTimeFrom% set set /A aDurTotalSec=%aTimeFrom%-%aTimeEnd% -set /A aDurHH=%aDurTotalSec% / 360000 -set /A aDurMM=(%aDurTotalSec% - %aDurHH%*360000) / 6000 -set /A aDurSS=(%aDurTotalSec% - %aDurHH%*360000 - %aDurMM%*6000) / 100 -if %aDurHH% LSS 10 set aDurHH=0%aDurHH% -if %aDurMM% LSS 10 set aDurMM=0%aDurMM% -if %aDurSS% LSS 10 set aDurSS=0%aDurSS% - -set "DURATION=%aDurHH%:%aDurMM%:%aDurSS%" -goto :eof diff --git a/adm/scripts/wasm_build.sh b/adm/scripts/wasm_build.sh deleted file mode 100755 index b02a3080c1..0000000000 --- a/adm/scripts/wasm_build.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash - -# Auxiliary script for semi-automated building of OCCT for WASM platform. -# wasm_custom.sh should be configured with paths to CMake, 3rd-parties and Emscripten SDK. -# FreeType should be specified as mandatory dependency. - -export aScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -export aSrcRoot="${aScriptDir}/../.." -export aBuildRoot=work - -export aNbJobs=${NUMBER_OF_PROCESSORS} - -export toCMake=1 -export toClean=0 -export toMake=1 -export toInstall=1 - -export BUILD_ModelingData=ON -export BUILD_ModelingAlgorithms=ON -export BUILD_Visualization=ON -export BUILD_ApplicationFramework=ON -export BUILD_DataExchange=ON - -if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then - . "${aScriptDir}/wasm_custom.sh" -fi - -. "${EMSDK_ROOT}/emsdk_env.sh" - -export aToolchain="${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" - -export aGitBranch=`git symbolic-ref --short HEAD` - -echo "Compilation OCCT branch : $aGitBranch" - -export aPlatformAndCompiler=wasm - -export aWorkDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}-make" -if [ ! -d "${aWorkDir}" ]; then - mkdir -p "${aWorkDir}" -fi - -export aDestDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}" -if [ ! -d "${aDestDir}" ]; then - mkdir -p "${aDestDir}" -fi - -export aLogFile="${aSrcRoot}/${aBuildRoot}/build-${aPlatformAndCompiler}.log" -if [ -f "${aLogFile}" ]; then - rm "${aLogFile}" -fi - -echo Start building OCCT for ${aPlatformAndCompiler} -echo Start building OCCT for ${aPlatformAndCompiler}>> "${aLogFile}" - -pushd "${aWorkDir}" -pwd -echo toCMake=${toCMake} -if [ "${toCMake}" = "1" ]; then - -echo "Configuring OCCT for WASM..." -echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ --DCMAKE_BUILD_TYPE:STRING="Release" \ --DBUILD_LIBRARY_TYPE:STRING="Static" \ --DINSTALL_DIR:PATH="${aDestDir}" \ --DINSTALL_DIR_INCLUDE:STRING="inc" \ --DINSTALL_DIR_RESOURCE:STRING="src" \ --D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ --DBUILD_MODULE_FoundationClasses:BOOL="ON" \ --DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ --DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ --DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \ --DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \ --DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \ --DBUILD_MODULE_Draw:BOOL="OFF" \ --DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}" - -cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ --DCMAKE_BUILD_TYPE:STRING="Release" \ --DBUILD_LIBRARY_TYPE:STRING="Static" \ --DINSTALL_DIR:PATH="${aDestDir}" \ --DINSTALL_DIR_INCLUDE:STRING="inc" \ --DINSTALL_DIR_RESOURCE:STRING="src" \ --D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ --DBUILD_MODULE_FoundationClasses:BOOL="ON" \ --DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ --DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ --DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \ --DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \ --DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \ --DBUILD_MODULE_Draw:BOOL="OFF" \ --DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}" - - if [ $? -ne 0 ]; then - echo "Problem during configuration" - popd - exit 1 - fi - -fi - -if [ "${toClean}" = "1" ]; then - make clean -fi - -if [ "${toMake}" = "1" ]; then - echo Building... - make -j ${aNbJobs} 2>> "${aLogFile}" - if [ $? -ne 0 ]; then - echo "Problem during make operation" - popd - exit 1 - fi - echo "${aLogFile}" -fi - -if [ "${toInstall}" = "1" ]; then - echo Installing into ${aDestDir} - make install 2>> "${aLogFile}" -fi - -popd diff --git a/adm/scripts/wasm_custom.bat.template b/adm/scripts/wasm_custom.bat.template deleted file mode 100644 index 0c52467a6a..0000000000 --- a/adm/scripts/wasm_custom.bat.template +++ /dev/null @@ -1,29 +0,0 @@ -rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat) -set "EMSDK_ROOT=%aCasSrc%\..\emsdk" -set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm32" -rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0" -rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32" -rem set "aCmakeBin=%ProgramW6432%\CMake\bin" - -rem Uncomment to customize building steps -rem set "aBuildRoot=work" -rem set "toCMake=1" -rem set "toClean=1" -rem set "toMake=1" -rem set "toInstall=1" -rem set "toPack=1" -rem set "toDebug=1" -rem set "toBuildSample=1" -rem Source map base (should point to server where C++ sources will be copied) -rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger. -rem set "sourceMapBase=http://localhost:9090/" - -rem set "BUILD_ModelingData=ON" -rem set "BUILD_ModelingAlgorithms=ON" -rem set "BUILD_Visualization=ON" -rem set "BUILD_ApplicationFramework=ON" -rem set "BUILD_DataExchange=ON" - -rem set "USE_RAPIDJSON=ON" -rem set "USE_DRACO=ON" -rem set "USE_PTHREADS=ON" diff --git a/adm/scripts/wasm_custom.sh.template b/adm/scripts/wasm_custom.sh.template deleted file mode 100644 index 29157c92c7..0000000000 --- a/adm/scripts/wasm_custom.sh.template +++ /dev/null @@ -1,16 +0,0 @@ -# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh) -export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm" -export EMSDK_ROOT="$aSrcRoot/../emsdk" - -# Uncomment to customize building steps -#export aBuildRoot=work -#export toCMake=1 -#export toClean=0 -#export toMake=1 -#export toInstall=1 - -#export BUILD_ModelingData=ON -#export BUILD_ModelingAlgorithms=ON -#export BUILD_Visualization=ON -#export BUILD_ApplicationFramework=ON -#export BUILD_DataExchange=ON diff --git a/adm/scripts/wasm_sample_build.bat b/adm/scripts/wasm_sample_build.bat deleted file mode 100644 index ca7b5a095e..0000000000 --- a/adm/scripts/wasm_sample_build.bat +++ /dev/null @@ -1,117 +0,0 @@ -@echo OFF - -rem Auxiliary script for semi-automated building of WebGL sample. -rem wasm_custom.bat should be configured with paths to CMake, 3rd-parties and Emscripten SDK. -rem FreeType should be specified as mandatory dependency. - -set "aCasSrc=%~dp0..\.." -set "aBuildRoot=%aCasSrc%\work" - -set aNbJobs=%NUMBER_OF_PROCESSORS% - -rem Paths to 3rd-party tools and libraries -set "aCmakeBin=" -set "aFreeType=" - -rem Build stages to perform -set "toCMake=1" -set "toClean=0" -set "toMake=1" -set "toInstall=1" -set "toDebug=0" -set "sourceMapBase=" - -set "USE_PTHREADS=OFF" - -rem Configuration file -if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat" - -call "%EMSDK_ROOT%\emsdk_env.bat" -set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" -if not ["%aCmakeBin%"] == [""] ( set "PATH=%aCmakeBin%;%PATH%" ) - -set "aBuildType=Release" -set "aBuildTypePrefix=" -set "anExtraCxxFlags=" -if /I ["%USE_PTHREADS%"] == ["ON"] ( - set "anExtraCxxFlags=-pthread" - set "aBuildTypePrefix=%aBuildTypePrefix%-pthread" -) -if ["%toDebug%"] == ["1"] ( - set "aBuildType=Debug" - set "aBuildTypePrefix=%aBuildTypePrefix%-debug" -) - -call :cmakeGenerate -if not ["%1"] == ["-nopause"] ( - pause -) - -goto :eof - -:cmakeGenerate -set "aPlatformAndCompiler=wasm32%aBuildTypePrefix%" -set "aDestDirOcct=%aBuildRoot%\occt-%aPlatformAndCompiler%" -set "aSrcRootSmpl=%aCasSrc%\samples\webgl" -set "aWorkDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-make" -set "aDestDirSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%" -set "aLogFileSmpl=%aBuildRoot%\sample-%aPlatformAndCompiler%-build.log" -if ["%toCMake%"] == ["1"] ( - if ["%toClean%"] == ["1"] ( - rmdir /S /Q %aWorkDirSmpl%" - rmdir /S /Q %aDestDirSmpl%" - ) -) -if not exist "%aWorkDirSmpl%" ( mkdir "%aWorkDirSmpl%" ) -if exist "%aLogFileSmpl%" ( del "%aLogFileSmpl%" ) - -pushd "%aWorkDirSmpl%" - -if ["%toCMake%"] == ["1"] ( - cmake -G "MinGW Makefiles" ^ - -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^ - -D CMAKE_BUILD_TYPE:STRING="%aBuildType%" ^ - -D CMAKE_CXX_FLAGS="%anExtraCxxFlags%" ^ - -D CMAKE_INSTALL_PREFIX:PATH="%aDestDirSmpl%" ^ - -D SOURCE_MAP_BASE:STRING="%sourceMapBase%" ^ - -D OpenCASCADE_DIR:PATH="%aDestDirOcct%/lib/cmake/opencascade" ^ - -D freetype_DIR:PATH="%aFreeType%/lib/cmake/freetype" ^ - "%aSrcRootSmpl%" - - if errorlevel 1 ( - popd - pause - exit /B - goto :eof - ) -) -if ["%toClean%"] == ["1"] ( - mingw32-make clean -) - -if ["%toMake%"] == ["1"] ( - echo Building... - mingw32-make -j %aNbJobs% 2>> "%aLogFileSmpl%" - if errorlevel 1 ( - type "%aLogFileSmpl%" - popd - pause - exit /B - goto :eof - ) - type "%aLogFileSmpl%" -) - -if ["%toInstall%"] == ["1"] ( - mingw32-make install 2>> "%aLogFileSmpl%" - if errorlevel 1 ( - type "%aLogFileSmpl%" - popd - pause - exit /B - goto :eof - ) -) -popd - -goto :eof diff --git a/adm/templates/android.toolchain.config.cmake b/adm/templates/android.toolchain.config.cmake deleted file mode 100644 index 3c5c70d563..0000000000 --- a/adm/templates/android.toolchain.config.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# A toolchain file to configure a Makefile Generators or the Ninja generator to target Android for cross-compiling. -# Set CMAKE_ANDROID_NDK variable equal to your Android NDK path. - -set (CMAKE_SYSTEM_NAME Android) -set (CMAKE_SYSTEM_VERSION 15) # API level -set (CMAKE_ANDROID_ARCH_ABI armeabi-v7a) -set (CMAKE_ANDROID_NDK "") -set (CMAKE_ANDROID_STL_TYPE gnustl_shared) diff --git a/adm/templates/codeblocks.bat b/adm/templates/codeblocks.bat deleted file mode 100644 index b4a72871f9..0000000000 --- a/adm/templates/codeblocks.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -rem Setup environment -call "%~dp0env.bat" %1 %2 %3 - -rem Define path to project file -set "PRJFILE=%~dp0\adm\wnt\cbp\OCCT.workspace" -if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\wnt\cbp\Products.workspace" -if not "%4" == "" ( - set "PRJFILE=%4" -) - -if "%CB_PATH%"=="" if exist "%PROGRAMFILES%\CodeBlocks" set "CB_PATH=%PROGRAMFILES%\CodeBlocks\codeblocks.exe" -if "%CB_PATH%"=="" if exist "%PROGRAMFILES(x86)%\CodeBlocks" set "CB_PATH=%PROGRAMFILES(x86)%\CodeBlocks\codeblocks.exe" -if "%CB_PATH%"=="" set "CB_PATH=codeblocks.exe" - -set "CASBIN=wnt\cbp" -set "PATH=%~dp0%CASBIN%\bin%CASDEB%;%PATH%" - -start "" "%CB_PATH%" "%PRJFILE%" diff --git a/adm/templates/codeblocks.sh b/adm/templates/codeblocks.sh deleted file mode 100755 index 0053187fae..0000000000 --- a/adm/templates/codeblocks.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# This file has been generated by genproj.tcl script from CASROOT/adm/templates/codeblocks.sh - -export TARGET="cbp" - -source ./env.sh "$1" "$TARGET" - -if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then - /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace -else - codeblocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace -fi diff --git a/adm/templates/env.bat b/adm/templates/env.bat index 45c9d81a48..f2c5a91295 100644 --- a/adm/templates/env.bat +++ b/adm/templates/env.bat @@ -208,7 +208,7 @@ set "PRODUCTS_DEFINES=" if ["%HAVE_TBB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB" & set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%" if ["%HAVE_OPENCL%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL" & set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%" if ["%HAVE_TK%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TK" & set "CSF_DEFINES=HAVE_TK;%CSF_DEFINES%" -if ["%HAVE_FREETYPE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREETYPE;%CSF_DEFINES%" +if ["%HAVE_FREETYPE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREETYPE" & set "CSF_DEFINES=HAVE_FREETYPE;%CSF_DEFINES%" if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%" if ["%HAVE_FFMPEG%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG" & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%" if ["%HAVE_VTK%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK" & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"