Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed version to 9.0, removed 32-bit test builds

Browse Source
This commit is contained in:
Jan Möbius
2020-04-23 11:32:01 +02:00
parent db8c060883
commit 7df0544e36
5 changed files with 20 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
.gitlab-ci.yml
View File

@@ -342,22 +342,6 @@ VS2017-64-bit-shared-no-apps:
paths:
- build-release/*.exe
VS2017-32-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
stage: build
variables:
@@ -372,21 +356,6 @@ VS2017-64-bit-static-no-apps:
paths:
- build-release/*.exe
VS2017-32-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-apps:
stage: build
variables:
@@ -416,34 +385,6 @@ VS2015-64-bit-shared-no-apps:
paths:
- build-release/*.exe
VS2015-32-bit-shared-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-apps:
stage: build
variables:
@@ -472,34 +413,6 @@ VS2015-64-bit-static-no-apps:
paths:
- build-release/*.exe
VS2015-32-bit-static-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
Doc-publish:
stage: deploy
only:

87
CI/gitlab-ci/windows.yml
View File

@@ -47,22 +47,6 @@ VS2017-64-bit-shared-no-apps:
paths:
- build-release/*.exe
VS2017-32-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2017-64-bit-static-no-apps:
stage: build
variables:
@@ -77,21 +61,6 @@ VS2017-64-bit-static-no-apps:
paths:
- build-release/*.exe
VS2017-32-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-apps:
stage: build
variables:
@@ -121,34 +90,6 @@ VS2015-64-bit-shared-no-apps:
paths:
- build-release/*.exe
VS2015-32-bit-shared-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-shared-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-static-apps:
stage: build
variables:
@@ -176,31 +117,3 @@ VS2015-64-bit-static-no-apps:
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-static-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe
VS2015-32-bit-static-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2015"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2015
artifacts:
paths:
- build-release/*.exe

16
Doc/changelog.docu
View File

@@ -6,6 +6,22 @@
<!-- --------------------------------------------------------------------- -->
<tr valign=top><td><b>9.0</b> (?/?/?)</td><td>
<b>Breaking Changes</b>
<ul>
<li>Dropped 32-bit Windows continuous integration and artifact builds.</li>
</ul>
<b>Build System</b>
<ul>
<li>Dropped 32-bit Windows continuous integration and artifact builds.</li>
</ul>
</tr>
<tr valign=top><td><b>8.1</b> (2020/04/23)</td><td>
<b>Breaking Changes</b>

6
VERSION
View File

@@ -1,6 +1,6 @@
VERSION=8.1
MAJOR=8
MINOR=1
VERSION=9.0
MAJOR=9
MINOR=0
PATCH=0
ID=OPENMESH

2
src/OpenMesh/Core/System/config.h
View File

@@ -65,7 +65,7 @@
// ----------------------------------------------------------------------------
#define OM_VERSION 0x80100
#define OM_VERSION 0x90000
//#define OM_VERSION 0x70200
#define OM_GET_VER ((OM_VERSION & 0xf0000) >> 16)