New versioning schema. Closes #5
This commit is contained in:
parent
ad4b9cbb6b
commit
188d7097e1
|
@ -1,4 +1,4 @@
|
|||
# Version 0.7.0 (unreleased)
|
||||
# Version 0.7.36 October 24, 2020
|
||||
- [#892] Show tooltip for piece node point.
|
||||
- [#894] Quick way to disable a passmark.
|
||||
- [#895] Improve path validation. Do not allow repeat the same curve twice.
|
||||
|
@ -53,6 +53,7 @@
|
|||
- New warning. Error calculating segment of curve.
|
||||
- Improve searching lost measurements. Additional case with underscores instead of regular spaces.
|
||||
- Redesign multisize measurements.
|
||||
- [smart-pattern/valentina#5] New versioning schema.
|
||||
|
||||
# Version 0.6.2 (unreleased)
|
||||
- [#903] Bug in tool Cut Spline path.
|
||||
|
|
|
@ -258,7 +258,7 @@ deploy:
|
|||
package: valentina-win_auto-upload
|
||||
publish: true
|
||||
override: true
|
||||
version: 0.7.0.0a
|
||||
version: 0.7.36
|
||||
on:
|
||||
DEPLOY: true
|
||||
artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)
|
||||
|
|
4
dist/OBS_debian/debian.changelog
vendored
4
dist/OBS_debian/debian.changelog
vendored
|
@ -1,5 +1,5 @@
|
|||
valentina (0.7.0) trusty; urgency=low
|
||||
valentina (0.7.36) trusty; urgency=low
|
||||
|
||||
* Auto build.
|
||||
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Mon, 12 Oct 2018 12:27:00 +0300
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Sat, 24 Oct 2020 12:27:00 +0300
|
||||
|
|
20
dist/OBS_debian/debian.tape.1
vendored
20
dist/OBS_debian/debian.tape.1
vendored
|
@ -1,6 +1,6 @@
|
|||
.\" Manpage for tape.
|
||||
.\" Contact dismine@gmail.com to correct errors.
|
||||
.TH tape 1 "10 March, 2017" "tape man page"
|
||||
.TH tape 1 "3 October, 2020" "tape man page"
|
||||
.SH NAME
|
||||
Tape \- Valentina's measurements editor.
|
||||
.SH SYNOPSIS
|
||||
|
@ -20,12 +20,14 @@ is a part of Valentina. And used for creating and editing measurement files.
|
|||
Displays this help.
|
||||
.IP "-v, --version"
|
||||
Displays version information.
|
||||
.IP "-e, --height <The base height>"
|
||||
Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm.
|
||||
.IP "-s, --size <The base size>"
|
||||
Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm.
|
||||
.IP "-u, --unit <The pattern unit>"
|
||||
Set pattern file unit: cm, mm, inch.
|
||||
.IP "-a, --dimensionA <The dimension A base>"
|
||||
Set base for dimension A in the table units.
|
||||
.IP "-b, --dimensionB <The dimension B base>"
|
||||
Set base for dimension B in the table units.
|
||||
.IP "-c, --dimensionA <The dimension C base>"
|
||||
Set base for dimension C in the table units.
|
||||
.IP "-u, --units <The pattern units>"
|
||||
Set pattern file units: cm, mm, inch.
|
||||
.IP "--test"
|
||||
Use for unit testing. Run the program and open a file without showing the main window.
|
||||
.IP "--no-scaling"
|
||||
|
@ -35,9 +37,5 @@ Disable high dpi scaling. Call this option if has problem with scaling (by defau
|
|||
\- the measurement file.
|
||||
.SH AUTHOR
|
||||
.RI "This manual page was written by Roman Telezhynskyi <" dismine@gmail.com ">"
|
||||
.SH "SEE ALSO"
|
||||
.RB "Full " "User Manual" " is availiable in"
|
||||
.UR https://bitbucket.org/dismine/valentina/wiki/manual/Content
|
||||
.UE
|
||||
|
||||
.BR valentina (1)
|
||||
|
|
10
dist/OBS_debian/debian.valentina.1
vendored
10
dist/OBS_debian/debian.valentina.1
vendored
|
@ -139,10 +139,12 @@ The path to output destination folder. By default the directory at which the app
|
|||
.RB "Export only details. Export details as they positioned in the details mode. Any layout related options will be ignored."
|
||||
.IP "--exportSuchDetails <The name regex>"
|
||||
.RB "Export only details that match a piece name regex."
|
||||
.IP "-x, --gsize <The size value>"
|
||||
.RB "Set size value a pattern file, that was opened with multisize measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm."
|
||||
.IP "-e, --gheight <The height value>"
|
||||
.RB "Set height value a pattern file, that was opened with multisize measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm."
|
||||
.IP "--dimensionA <The dimension A base>"
|
||||
.RB "Set base for dimension A in the multisize measurements units " "(export mode)" "."
|
||||
.IP "--dimensionB <The dimension B base>"
|
||||
.RB "Set base for dimension B in the multisize measurements units " "(export mode)" "."
|
||||
.IP "--dimensionC <The dimension C base>"
|
||||
.RB "Set base for dimension C in the multisize measurements units " "(export mode)" "."
|
||||
.IP "--userMaterial <User material>"
|
||||
.RB "Use this option to override user material defined in pattern. The value must be in form <number>@<user matrial name>. The number should be in range from 1 to 20. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode."
|
||||
.IP "-p, --pageformat <Template number>"
|
||||
|
|
4
dist/debian/changelog
vendored
4
dist/debian/changelog
vendored
|
@ -1,5 +1,5 @@
|
|||
valentina (0.7.0) trusty; urgency=low
|
||||
valentina (0.7.36) trusty; urgency=low
|
||||
|
||||
* Auto build.
|
||||
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Mon, 12 Oct 2018 12:27:00 +0300
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Sat, 24 Oct 2020 12:27:00 +0300
|
||||
|
|
8
dist/macx/tape/Info.plist
vendored
8
dist/macx/tape/Info.plist
vendored
|
@ -9,9 +9,9 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.6</string>
|
||||
<string>10.7</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2013-2018, Valentina project</string>
|
||||
<string>© 2013-2020, Valentina project</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>@TYPEINFO@</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
|
@ -19,9 +19,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.7.0</string>
|
||||
<string>0.7.36</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.7.0.0</string>
|
||||
<string>0.7.36.0</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
|
|
8
dist/macx/valentina/Info.plist
vendored
8
dist/macx/valentina/Info.plist
vendored
|
@ -9,9 +9,9 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.6</string>
|
||||
<string>10.7</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2013-2018, Valentina project</string>
|
||||
<string>© 2013-2020, Valentina project</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>@TYPEINFO@</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
|
@ -19,9 +19,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.7.0</string>
|
||||
<string>0.7.36</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.7.0.0</string>
|
||||
<string>0.7.36.0</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
|
|
2
dist/rpm/_service
vendored
2
dist/rpm/_service
vendored
|
@ -1,7 +1,7 @@
|
|||
<services>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/dismine/Valentina_git.git</param>
|
||||
<param name="versionprefix">0.6.999</param>
|
||||
<param name="versionprefix">0.7.36</param>
|
||||
<param name="filename">valentina</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
|
|
4
dist/rpm/valentina.spec
vendored
4
dist/rpm/valentina.spec
vendored
|
@ -91,7 +91,7 @@ Requires: poppler-tools
|
|||
Requires: poppler-utils
|
||||
%endif
|
||||
|
||||
Version: 0.7.0
|
||||
Version: 0.7.36
|
||||
Release: 0
|
||||
URL: https://gitlab.com/smart-pattern/valentina
|
||||
License: GPL-3.0+
|
||||
|
@ -243,6 +243,6 @@ rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dis
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 11 2018 Roman Telezhynskyi
|
||||
* Sat Oct 24 2020 Roman Telezhynskyi
|
||||
- Auto build
|
||||
|
||||
|
|
19
dist/valentina.dsc
vendored
19
dist/valentina.dsc
vendored
|
@ -2,17 +2,24 @@ Format: 3.0 (native)
|
|||
Source: valentina
|
||||
Binary: valentina
|
||||
Architecture: i386 amd64
|
||||
Version: 0.3.3
|
||||
Version: 0.7.36
|
||||
Maintainer: Roman Telezhynskyi <dismine@gmail.com>
|
||||
Homepage: http://www.valentina-project.org/
|
||||
Homepage: https://valentinaproject.bitbucket.io
|
||||
Standards-Version: 3.9.5
|
||||
Vcs-Browser: https://bitbucket.org/dismine/valentina
|
||||
Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0), libqt5xmlpatterns5-dev (>= 5.0.0)
|
||||
Build-Depends: debhelper (>= 8.0.0),
|
||||
qtbase5-dev (>= 5.4.0),
|
||||
libqt5svg5-dev (>= 5.4.0),
|
||||
g++ (>= 4.8.0),
|
||||
qt5-default (>= 5.4.0),
|
||||
qttools5-dev-tools (>= 5.4.0),
|
||||
libqt5xmlpatterns5-dev (>= 5.4.0),
|
||||
libqt5opengl5-dev (>= 5.4.0)
|
||||
Package-List:
|
||||
valentina deb graphics optional
|
||||
Checksums-Sha1:
|
||||
581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.3.3.tar
|
||||
581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.36.tar
|
||||
Checksums-Sha256:
|
||||
9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.3.3.tar
|
||||
9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.36.tar
|
||||
Files:
|
||||
95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.3.3.tar
|
||||
95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.36.tar
|
||||
|
|
6
dist/win/inno/valentina.iss
vendored
6
dist/win/inno/valentina.iss
vendored
|
@ -6,11 +6,11 @@
|
|||
#define MyAppPublisher "Roman Telezhynskyi"
|
||||
#define MyAppURL "http://valentinaproject.bitbucket.io/"
|
||||
#define MyAppExeName "valentina.exe"
|
||||
#define MyAppCopyright "(C) 2013-2018 Valentina project"
|
||||
#define MyAppCopyright "(C) 2013-2020 Valentina project"
|
||||
#define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', '');
|
||||
; Appstatus: "" = release, "b" = beta, "a" = alpha
|
||||
; this only modifies the resulting exe name of the installer package ;-)
|
||||
#define MyAppStatus "a"
|
||||
#define MyAppStatus ""
|
||||
|
||||
[Setup]
|
||||
; NOTE: The value of AppId uniquely identifies this application.
|
||||
|
@ -226,8 +226,6 @@ Source: ".\valentina\*.txt"; DestDir: "{app}"; Flags: ignoreversion
|
|||
Source: ".\valentina\*.rcc"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: ".\valentina\*.ico"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: ".\valentina\*.ini"; DestDir: "{app}"; Flags: ignoreversion
|
||||
; Only for test versions
|
||||
;Source: ".\valentina\VERSION"; DestDir: "{app}"; Flags: ignoreversion
|
||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||
; DLL used to check if the target program is running at install time
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
"repo": "Valentina",
|
||||
"subject": "dismine",
|
||||
"desc": "Was pushed completely automatically",
|
||||
"website_url": "http://valentina-project.org/",
|
||||
"website_url": "https://valentinaproject.bitbucket.io",
|
||||
"issue_tracker_url": "https://gitlab.com/smart-pattern/valentina/-/issues",
|
||||
"vcs_url": "https://gitlab.com/smart-pattern/valentina",
|
||||
"github_use_tag_release_notes": false,
|
||||
|
@ -15,10 +15,10 @@
|
|||
},
|
||||
|
||||
"version": {
|
||||
"name": "0.7.0a",
|
||||
"desc": "Fake release",
|
||||
"released": "2020-07-13",
|
||||
"vcs_tag": "0.7.0",
|
||||
"name": "0.7.36",
|
||||
"desc": "Test branch release",
|
||||
"released": "2020-10-24",
|
||||
"vcs_tag": "v0.7.36",
|
||||
"gpgSign": false
|
||||
},
|
||||
|
||||
|
|
|
@ -42,9 +42,9 @@
|
|||
|
||||
extern const int MAJOR_VERSION = 0;
|
||||
extern const int MINOR_VERSION = 7;
|
||||
extern const int DEBUG_VERSION = 0;
|
||||
extern const int DEBUG_VERSION = 36;
|
||||
|
||||
extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4a").arg(MAJOR_VERSION).arg(MINOR_VERSION)
|
||||
extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION)
|
||||
.arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -40,13 +40,17 @@ extern const QString APP_VERSION_STR;
|
|||
/*
|
||||
APP_VERSION is (major << 16) + (minor << 8) + patch.
|
||||
*/
|
||||
#define APP_VERSION 0x000700
|
||||
#define APP_VERSION V_VERSION_CHECK(MAJOR_VERSION, MINOR_VERSION, DEBUG_VERSION)
|
||||
/*
|
||||
can be used like #if (APP_VERSION >= V_VERSION_CHECK(0, 7, 0))
|
||||
*/
|
||||
#define V_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
|
||||
|
||||
// Change version number in projectversion.cpp too.
|
||||
// Synchronize valentina.nsi
|
||||
|
||||
#define VER_FILEVERSION 0,7,0,0
|
||||
#define VER_FILEVERSION_STR "0.7.0.0a\0"
|
||||
#define VER_FILEVERSION 0,7,36
|
||||
#define VER_FILEVERSION_STR "0.7.36\0"
|
||||
|
||||
#define V_PRERELEASE // Mark prerelease builds
|
||||
|
||||
|
@ -56,7 +60,7 @@ extern const QString APP_VERSION_STR;
|
|||
#define VER_COMPANYNAME_STR "ValentinaTeam"
|
||||
//#define VER_FILEDESCRIPTION_STR "Patternmaking program." // Defined in program
|
||||
//#define VER_INTERNALNAME_STR "Valentina" // Defined in program
|
||||
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2014-2018 Valentina Team"
|
||||
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2014-2020 Valentina Team"
|
||||
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
|
||||
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
|
||||
//#define VER_ORIGINALFILENAME_STR "valentina.exe" // Defined in program
|
||||
|
|
Loading…
Reference in New Issue
Block a user