Skip to content

Commit 9ca352e

Browse files
dacusterdacuster
authored
Merge pull request #412 from LORD-MicroStrain/develop
Release 67.0.0
2 parents d5e470c + 125b2ee commit 9ca352e

File tree

77 files changed

+5500
-5858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+5500
-5858
lines changed

‎.devcontainer/Dockerfile.ubuntu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN set -ex \
3333
RUN set -ex && apt-get update && apt-get install -y python2-dev || apt-get install -y python-dev
3434

3535
# Install additional python versions
36-
ARG PYTHON3_VERSIONS="3.5.10 3.6.15"
36+
ARG PYTHON3_VERSIONS="3.9.21 3.10.16"
3737
RUN set -ex \
3838
&& for PYTHON3_VERSION in ${PYTHON3_VERSIONS}; do \
3939
curl -fsSLo /tmp/Python-${PYTHON3_VERSION}.tgz https://www.python.org/ftp/python/${PYTHON3_VERSION}/Python-${PYTHON3_VERSION}.tgz; \

‎.devcontainer/Dockerfile.windows‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ ARG WINDOWS_VERSION
55
FROM ${WINDOWS_IMAGE}:${WINDOWS_VERSION}
66

77
# Temporary directory
8-
ENV DOCKER_TEMP_DIR "C:\DockerTemp"
8+
ENV DOCKER_TEMP_DIR "C:/DockerTemp"
99

1010
# All dependencies will be installed in this directory
11-
ENV LIB_PATH "C:\lib"
11+
ENV LIB_PATH "C:/lib"
1212

1313
# Restore the default Windows shell for correct batch processing.
1414
SHELL ["cmd", "/S", "/C"]
1515

1616
# Install any additional certificates
17-
COPY .devcontainer\extra_cas C:\DockerTemp\Certs
18-
RUN for %f in (%DOCKER_TEMP_DIR%\Certs\*.crt %DOCKER_TEMP_DIR%\Certs\*.pem) do ( `
19-
powershell -Command "Import-Certificate -FilePath %f -CertStoreLocation Cert:\LocalMachine\Root" `
17+
COPY .devcontainer/extra_cas C:/DockerTemp/Certs
18+
RUN for %f in (%DOCKER_TEMP_DIR%/Certs/*.crt %DOCKER_TEMP_DIR%/Certs/*.pem) do ( `
19+
powershell -Command "Import-Certificate -FilePath %f -CertStoreLocation Cert:/LocalMachine/Root" `
2020
)
2121

2222
# Install Microsoft Buildtools
2323
RUN `
2424
# Download the Build Tools bootstrapper.
25-
curl -SL --output %DOCKER_TEMP_DIR%\vs_buildtools.exe https://aka.ms/vs/15/release/vs_buildtools.exe `
25+
curl -SL --output %DOCKER_TEMP_DIR%/vs_buildtools.exe https://aka.ms/vs/15/release/vs_buildtools.exe `
2626
`
2727
# Install Build Tools
2828
&& echo Starting install `
29-
&& (start /w %DOCKER_TEMP_DIR%\vs_buildtools.exe --quiet --wait --norestart --nocache `
29+
&& (start /w %DOCKER_TEMP_DIR%/vs_buildtools.exe --quiet --wait --norestart --nocache `
3030
--add Microsoft.Net.Component.4.8.SDK `
3131
--add Microsoft.Net.Component.4.8.TargetingPack `
3232
--add Microsoft.Net.Component.4.TargetingPack `
@@ -37,173 +37,173 @@ RUN `
3737
--add Microsoft.VisualStudio.Component.VC.140 `
3838
--add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
3939
--add Microsoft.Component.VC.Runtime.UCRTSDK `
40-
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" `
40+
--installPath "%ProgramFiles(x86)%/Microsoft Visual Studio/2017/BuildTools" `
4141
|| IF "%ERRORLEVEL%"=="3010" EXIT 0) `
4242
`
4343
# Cleanup
44-
&& del /q %DOCKER_TEMP_DIR%\vs_buildtools.exe
44+
&& del /q %DOCKER_TEMP_DIR%/vs_buildtools.exe
4545

4646
# Install Boost
4747
ARG BOOST_VERSION=1.68.0
4848
ARG BOOST_VERSION_UNDERSCORE=1_68_0
4949
ARG BOOST_MSVC_VERSION=14.0
5050
RUN echo Installing Boost `
5151
# Download the boost installer
52-
&& curl -SL --output %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
53-
&& curl -SL --output %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
52+
&& curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
53+
&& curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
5454
`
55-
# Install
56-
&& (start /w %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe /VERYSILENT /DIR=%LIB_PATH%\boost) `
57-
&& (start /w %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe /VERYSILENT /DIR=%LIB_PATH%\boost) `
55+
# Install
56+
&& (start /w %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe /VERYSILENT /DIR=%LIB_PATH%/boost) `
57+
&& (start /w %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe /VERYSILENT /DIR=%LIB_PATH%/boost) `
5858
`
5959
# Cleanup
60-
&& del /q %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
61-
&& del /q %DOCKER_TEMP_DIR%\boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe
60+
&& del /q %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
61+
&& del /q %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe
6262

6363
# Install CMake
6464
ARG CMAKE_VERSION=3.23.1
6565
RUN `
6666
# Download the cmake installer
67-
curl -SL --output %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi https://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/cmake-%CMAKE_VERSION%-windows-x86_64.msi `
67+
curl -SL --output %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi https://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/cmake-%CMAKE_VERSION%-windows-x86_64.msi `
6868
`
6969
# Install cmake
70-
&& msiexec /i %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi /quiet /qn /norestart `
70+
&& msiexec /i %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi /quiet /qn /norestart `
7171
`
7272
# Add Cmake to the path
73-
&& setx PATH "%PATH;C:\Program Files\CMake\bin" `
73+
&& setx PATH "%PATH;C:/Program Files/CMake/bin" `
7474
`
7575
# Cleanup
76-
&& del /q %DOCKER_TEMP_DIR%\cmake-%CMAKE_VERSION%-windows-x86_64.msi
76+
&& del /q %DOCKER_TEMP_DIR%/cmake-%CMAKE_VERSION%-windows-x86_64.msi
7777

7878
# Install 7zip
7979
ARG 7ZIP_VERSION=2107
8080
RUN echo Installing 7zip `
8181
# Download the installer
82-
&& curl -SL --output %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi https://www.7-zip.org/a/7z%7ZIP_VERSION%-x64.msi `
82+
&& curl -SL --output %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi https://www.7-zip.org/a/7z%7ZIP_VERSION%-x64.msi `
8383
`
8484
# Run the installer
85-
&& msiexec /i %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi /quiet /qn /norestart `
85+
&& msiexec /i %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi /quiet /qn /norestart `
8686
`
8787
# Add 7zip the the path
88-
&& setx PATH "%PATH%;C:\Program Files\7-Zip" `
88+
&& setx PATH "%PATH%;C:/Program Files/7-Zip" `
8989
`
9090
# Cleanup
91-
&& del /q %DOCKER_TEMP_DIR%\7z%7ZIP_VERSION%-x64.msi
91+
&& del /q %DOCKER_TEMP_DIR%/7z%7ZIP_VERSION%-x64.msi
9292

9393
# Install OpenSSL
9494
ARG OPENSSL_VERSION=1.1.0f
9595
ARG OPENSSL_MSVC_VERSION=2015
9696
RUN echo Installing OpenSSL `
9797
# Download the zip file
98-
&& curl -SL --output %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z https://www.npcglib.org/~stathis/downloads/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z `
98+
&& curl -SL --output %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z https://www.npcglib.org/~stathis/downloads/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z `
9999
`
100100
# Extract the artifacts
101-
&& 7z x %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z "-o%LIB_PATH%" `
102-
&& move %LIB_PATH%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION% %LIB_PATH%\openssl `
101+
&& 7z x %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z "-o%LIB_PATH%" `
102+
&& move %LIB_PATH%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION% %LIB_PATH%/openssl `
103103
`
104104
# Cleanup
105-
&& del /q %DOCKER_TEMP_DIR%\openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z
105+
&& del /q %DOCKER_TEMP_DIR%/openssl-%OPENSSL_VERSION%-vs%OPENSSL_MSVC_VERSION%.7z
106106

107107
# Install Git
108108
ARG GIT_VERSION=2.36.0
109109
RUN echo Installing Git `
110110
# Download the installer
111-
&& curl -SL --output %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe https://github.com/git-for-windows/git/releases/download/v%GIT_VERSION%.windows.1/Git-%GIT_VERSION%-64-bit.exe `
111+
&& curl -SL --output %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe https://github.com/git-for-windows/git/releases/download/v%GIT_VERSION%.windows.1/Git-%GIT_VERSION%-64-bit.exe `
112112
`
113113
# Install
114-
&& (start /w %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe /VERYSILENT /DIR="C:\Program Files\Git") `
114+
&& (start /w %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe /VERYSILENT /DIR="C:/Program Files/Git") `
115115
`
116116
# Add Windows to the path
117-
&& setx PATH "%PATH%;C:\Program Files\Git\bin" `
117+
&& setx PATH "%PATH%;C:/Program Files/Git/bin" `
118118
`
119119
# Cleanup
120-
&& del /q %DOCKER_TEMP_DIR%\Git-%GIT_VERSION%-64-bit.exe
120+
&& del /q %DOCKER_TEMP_DIR%/Git-%GIT_VERSION%-64-bit.exe
121121

122122
# Install Python3
123-
ARG PYTHON3_VERSIONS="3.5.0"
123+
ARG PYTHON3_VERSIONS="3.9.0"
124124
RUN echo Installing Python3 `
125125
&& for %v in (%PYTHON3_VERSIONS%) do ( `
126126
echo Installing Python%v `
127127
`
128128
# Download the installer
129-
&& curl -SL --output %DOCKER_TEMP_DIR%\python-%v.exe https://www.python.org/ftp/python/%v/python-%v.exe `
130-
&& curl -SL --output %DOCKER_TEMP_DIR%\python-%v-amd64.exe https://www.python.org/ftp/python/%v/python-%v-amd64.exe `
129+
&& curl -SL --output %DOCKER_TEMP_DIR%/python-%v.exe https://www.python.org/ftp/python/%v/python-%v.exe `
130+
&& curl -SL --output %DOCKER_TEMP_DIR%/python-%v-amd64.exe https://www.python.org/ftp/python/%v/python-%v-amd64.exe `
131131
`
132132
# Install
133-
&& (start /w %DOCKER_TEMP_DIR%\python-%v.exe /quiet TargetDir="C:\Python%v-Win32") `
134-
&& (start /w %DOCKER_TEMP_DIR%\python-%v-amd64.exe /quiet TargetDir="C:\Python%v-x64") `
133+
&& (start /w %DOCKER_TEMP_DIR%/python-%v.exe /quiet TargetDir="C:/Python%v-Win32") `
134+
&& (start /w %DOCKER_TEMP_DIR%/python-%v-amd64.exe /quiet TargetDir="C:/Python%v-x64") `
135135
`
136136
# Cleanup
137-
&& del /q %DOCKER_TEMP_DIR%\python-%v.exe `
138-
&& del /q %DOCKER_TEMP_DIR%\python-%v-amd64.exe `
137+
&& del /q %DOCKER_TEMP_DIR%/python-%v.exe `
138+
&& del /q %DOCKER_TEMP_DIR%/python-%v-amd64.exe `
139139
)
140140

141141
# Install Python2
142142
ARG PYTHON2_VERSION="2.7.18"
143143
RUN echo Install Python2 `
144144
`
145145
# Download the installer
146-
&& curl -SL --output %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.msi `
147-
&& curl -SL --output %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.amd64.msi `
146+
&& curl -SL --output %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.msi `
147+
&& curl -SL --output %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi https://www.python.org/ftp/python/%PYTHON2_VERSION%/python-%PYTHON2_VERSION%.amd64.msi `
148148
`
149149
# Install
150-
&& msiexec /i %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi /quiet /qn /norestart TargetDir="C:\Python2.7-Win32" `
151-
&& msiexec /i %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi /quiet /qn /norestart TargetDir="C:\Python2.7-x64" `
150+
&& msiexec /i %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi /quiet /qn /norestart TargetDir="C:/Python2.7-Win32" `
151+
&& msiexec /i %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi /quiet /qn /norestart TargetDir="C:/Python2.7-x64" `
152152
`
153153
# Cleanup
154-
&& del /q %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.msi `
155-
&& del /q %DOCKER_TEMP_DIR%\python-%PYTHON2_VERSION%.amd64.msi
154+
&& del /q %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.msi `
155+
&& del /q %DOCKER_TEMP_DIR%/python-%PYTHON2_VERSION%.amd64.msi
156156

157157
# Install swig
158158
ARG SWIG_VERSION="4.0.2"
159159
RUN echo Installing SWIG `
160160
`
161161
# Download the zip file
162-
&& curl -SL --output %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip https://sourceforge.net/projects/swig/files/swigwin/swigwin-%SWIG_VERSION%/swigwin-%SWIG_VERSION%.zip/download `
162+
&& curl -SL --output %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip https://sourceforge.net/projects/swig/files/swigwin/swigwin-%SWIG_VERSION%/swigwin-%SWIG_VERSION%.zip/download `
163163
`
164164
# Extract to the library path
165-
&& 7z x %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip "-o%LIB_PATH%" `
166-
&& move %LIB_PATH%\swigwin-%SWIG_VERSION% %LIB_PATH%\swig `
165+
&& 7z x %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip "-o%LIB_PATH%" `
166+
&& move %LIB_PATH%/swigwin-%SWIG_VERSION% %LIB_PATH%/swig `
167167
`
168168
# Add to the path
169-
&& setx PATH "%PATH%;%LIB_PATH%\swig" `
169+
&& setx PATH "%PATH%;%LIB_PATH%/swig" `
170170
`
171171
# Cleanup
172-
&& del /q %DOCKER_TEMP_DIR%\swigwin-%SWIG_VERSION%.zip
172+
&& del /q %DOCKER_TEMP_DIR%/swigwin-%SWIG_VERSION%.zip
173173

174174
# Install NaturalDocs
175175
ARG NATURAL_DOCS_VERSION="2.0.2"
176176
RUN echo Installing NaturalDocs `
177177
`
178178
# Download the zip file
179-
&& curl -SL --output %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip https://www.naturaldocs.org/download/natural_docs/%NATURAL_DOCS_VERSION%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip `
179+
&& curl -SL --output %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip https://www.naturaldocs.org/download/natural_docs/%NATURAL_DOCS_VERSION%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip `
180180
`
181181
# Extract to the library path
182-
&& 7z x %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip "-o%LIB_PATH%" `
183-
&& move "%LIB_PATH%\Natural Docs" %LIB_PATH%\NaturalDocs `
182+
&& 7z x %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip "-o%LIB_PATH%" `
183+
&& move "%LIB_PATH%/Natural Docs" %LIB_PATH%/NaturalDocs `
184184
`
185185
# Add to the path
186-
&& setx PATH "%PATH%;%LIB_PATH%\NaturalDocs" `
186+
&& setx PATH "%PATH%;%LIB_PATH%/NaturalDocs" `
187187
`
188188
# Cleanup
189-
&& del /q %DOCKER_TEMP_DIR%\Natural_Docs_%NATURAL_DOCS_VERSION%.zip
189+
&& del /q %DOCKER_TEMP_DIR%/Natural_Docs_%NATURAL_DOCS_VERSION%.zip
190190

191191
# Install Turtle
192192
ARG TURTLE_VERSION="1.3.2"
193193
RUN echo Installing Turtle `
194194
`
195195
# Download the zip file
196-
&& curl -SL --output %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip https://sourceforge.net/projects/turtle/files/turtle/%TURTLE_VERSION%/turtle-%TURTLE_VERSION%.zip/download `
196+
&& curl -SL --output %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip https://sourceforge.net/projects/turtle/files/turtle/%TURTLE_VERSION%/turtle-%TURTLE_VERSION%.zip/download `
197197
`
198198
# Extract to the library path
199-
&& mkdir "%LIB_PATH%\turtle" `
200-
&& 7z x %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip "-o%LIB_PATH%\turtle" `
199+
&& mkdir "%LIB_PATH%/turtle" `
200+
&& 7z x %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip "-o%LIB_PATH%/turtle" `
201201
`
202202
# Cleanup
203-
&& del /q %DOCKER_TEMP_DIR%\turtle-%TURTLE_VERSION%.zip
203+
&& del /q %DOCKER_TEMP_DIR%/turtle-%TURTLE_VERSION%.zip
204204

205205
# Allow users to execute powershell scripts
206206
RUN powershell -Command "Set-ExecutionPolicy RemoteSigned"
207207

208208
# Set the entrypoint to powershell
209-
ENTRYPOINT ["powershell"]
209+
ENTRYPOINT ["powershell"]

‎.devcontainer/docker_build_debs.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
# Get some arguments from the user
1010
arch="amd64"
1111
ubuntu_version="20.04"
12-
python3_versions="3.7.16 3.8.16 3.9.16 3.10.9 3.11.1"
12+
python3_versions="3.9.21 3.10.16 3.11.11 3.12.8 3.13.1"
1313
while [[ $# -gt 0 ]]; do
1414
case $1 in
1515
--arch)
@@ -78,6 +78,7 @@ docker run \
7878
git fetch origin --tags; \
7979
./BuildScripts/build_linux.sh \
8080
${python3_dirs_flag} \
81+
--branch ${BRANCH_NAME} \
8182
--python2Dir /usr/lib/python2.7 \
8283
--buildDir /home/microstrain/MSCL/${build_dir_name} \
83-
"
84+
"

‎.devcontainer/docker_build_win.ps1‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
param (
77
[String]$windows_image,
88
[String]$windows_version,
9-
[String]$python3_versions = "3.7.0 3.8.0 3.9.0 3.10.0 3.11.0",
9+
[String]$python3_versions = "3.9.0 3.10.0 3.11.0 3.12.0 3.13.0",
1010
[String]$arch = "x64"
1111
)
1212

@@ -35,18 +35,18 @@ try {
3535
$project_dir = "${script_dir}/.."
3636
$dockerfile = "${script_dir}/Dockerfile.windows"
3737
$image_name = "microstrain/mscl_windows_builder:${windows_version}"
38-
38+
3939
if ("${arch}" -eq "x86") {
4040
$cmake_arch = "Win32"
4141
} else {
4242
$cmake_arch = ${arch}
4343
}
4444

4545
# Construct the flags that we will pass to the build script
46-
$python2_build_script_flags = "-python2Dirs C:\Python2.7-${cmake_arch}"
46+
$python2_build_script_flags = "-python2Dirs C:/Python2.7-${cmake_arch}"
4747
$python3_build_script_flags = "-python3Dirs "
4848
foreach ($python3_version in ${python3_versions}.split(" ")) {
49-
$python3_build_script_flags += "C:\Python${python3_version}-${cmake_arch},"
49+
$python3_build_script_flags += "C:/Python${python3_version}-${cmake_arch},"
5050
}
5151
$python3_build_script_flags = $python3_build_script_flags.TrimEnd(',')
5252

@@ -75,13 +75,12 @@ try {
7575
--cpus="${num_cpus}" `
7676
--memory="${memory}g" `
7777
--isolation="process" `
78-
-v "${project_dir}:C:\Projects\MSCL" `
79-
-w "C:\projects\mscl" `
78+
-v "${project_dir}:C:/Projects/MSCL" `
79+
-w "C:/projects/mscl" `
8080
"${image_name}" -Command " `
8181
git config --global --add safe.directory C:/projects/mscl; `
8282
git fetch origin --tags; `
83-
& 'C:\Projects\MSCL\BuildScripts\build_win.ps1' -arch ${cmake_arch} -buildDir C:\projects\mscl\docker_build\${cmake_arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
84-
& 'C:\Projects\MSCL\BuildScripts\zip_win.ps1' -arch ${arch}; `
83+
& 'C:/Projects/MSCL/BuildScripts/build_win.ps1' -branch ${env:BRANCH_NAME} -arch ${cmake_arch} -buildDir C:/projects/mscl/build_windows_${arch} ${python2_build_script_flags} ${python3_build_script_flags}; `
8584
"
8685
}
8786
catch {

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ sample_mscl_cpp/
1212
/mscl_ubuntu_*.tar.bz2
1313
/mscl_centos_*.tar.bz2
1414
/[Oo]utput
15+
.*git-askpass
16+
17+
## Ignore any CMake generated project files
18+
LibVersion.h
19+
AssemblyInfo.cs
20+
1521

1622
## Ignore JetBrains files
1723
*.idea

0 commit comments

Comments
 (0)