Skip to content

Commit 09649b9

Browse files
authored
Sync with v1.1.1 release from micmacIGN
v1.1.1
2 parents 971332b + e2c813a commit 09649b9

File tree

66 files changed

+4575
-638
lines changed

Some content is hidden

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

66 files changed

+4575
-638
lines changed

.github/workflows/release_bin.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Build Bin
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
build_linux:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Install Qt
16+
run: sudo apt install qtbase5-dev
17+
18+
- name: Configure CMake
19+
run: cmake -B build -DWITH_CCACHE=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_QT5=ON
20+
21+
- name: Build
22+
run: make -C build install -j 4
23+
24+
- name: Create Archive
25+
run: bash -c "cd build && ../script_create_bin_dist.sh linux"
26+
27+
- name: Upload binaries to release
28+
uses: softprops/action-gh-release@v1
29+
with:
30+
token: ${{ secrets.GITHUB_TOKEN }}
31+
files: build/micmac_linux.tgz
32+
33+
build_win:
34+
runs-on: windows-latest
35+
36+
steps:
37+
- uses: actions/checkout@v3
38+
39+
- name: Install Qt
40+
uses: jurplel/install-qt-action@v3
41+
with:
42+
cache: true
43+
44+
- name: Configure CMake
45+
run: cmake -B build -DWITH_CCACHE=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_QT5=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}
46+
47+
- name: Build
48+
run: cmake --build build --config Release --target INSTALL -j 4
49+
- name: Package
50+
shell: bash
51+
run: |
52+
env
53+
mkdir -p bin/platforms bin/imageformats
54+
DEST=$(pwd)/bin
55+
cd $Qt5_Dir/bin
56+
cp Qt5Core.dll Qt5Gui.dll Qt5Xml.dll Qt5OpenGL.dll Qt5Widgets.dll $DEST/
57+
cd $Qt5_Dir/plugins
58+
cp platforms/qwindows.dll $DEST/platforms/
59+
cp imageformats/*.dll $DEST/imageformats/
60+
cd $GITHUB_WORKSPACE
61+
ls -lrt bin
62+
63+
- name: Create Zip
64+
run: 7z a micmac_windows.zip bin\ binaire-aux\ include\XML_MicMac\ include\XML_GEN\ include\qt
65+
66+
- name: Upload binaries to release
67+
uses: softprops/action-gh-release@v1
68+
with:
69+
token: ${{ secrets.GITHUB_TOKEN }}
70+
files: micmac_windows.zip
71+

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ if(${WITH_QT5})
207207
message (" WindowsSDKDir : " ${CMAKE_PREFIX_PATH} )
208208
endif()
209209

210-
#add_compile_definitions(QT_NO_DEPRECATED_WARNINGS=1) # to work with both ubuntu 20.04 and 22.04...
210+
add_compile_definitions(QT_NO_DEPRECATED_WARNINGS=1) # to work with both ubuntu 20.04 and 22.04... MPD ->
211211
find_package(Qt5Widgets REQUIRED)
212212
find_package(Qt5Xml REQUIRED)
213213
find_package(Qt5Concurrent REQUIRED)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
2+
<MMVII_Serialization>
3+
<NameProfile>"Default"</NameProfile>
4+
</MMVII_Serialization>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
2+
<MMVII_Serialization>
3+
<MetaData>
4+
<Nb>3</Nb>
5+
<el>
6+
<Mode>"Focalmm"</Mode>
7+
<Nb>2</Nb>
8+
<el>
9+
<Pat>"XXXXXXXXXX.*XXXXXXX"</Pat>
10+
<Val>"1"</Val>
11+
</el>
12+
<el>
13+
<Pat>"XXXXXXXXXX.*XXXXXXX"</Pat>
14+
<Val>"2"</Val>
15+
</el>
16+
</el>
17+
<el>
18+
<Mode>"Aperture"</Mode>
19+
<Nb>0</Nb>
20+
</el>
21+
<el>
22+
<Mode>"ModeleCam"</Mode>
23+
<Nb>0</Nb>
24+
</el>
25+
</MetaData>
26+
</MMVII_Serialization>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
2+
<MMVII_Serialization>
3+
<UserName>"Uknown"</UserName>
4+
<NbProcMax>1000</NbProcMax>
5+
</MMVII_Serialization>

0 commit comments

Comments
 (0)