Skip to content

Commit

Permalink
publish release v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
teasit committed May 12, 2022
1 parent f2cccf5 commit 9dad82e
Show file tree
Hide file tree
Showing 7 changed files with 171 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
MFTyreToolApp_resources/
sandbox/
*.asv
*.mltbx
*.mlappinstall
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Changelog

- Updated MFTyreLibrary submodule which fixed minor issue with Fitter
- No functional changes, just installation changes
- Tool is now distributed as app contained in toolbox, because FileExchange
and GitHub Releases only integrate well with toolboxes.
Binary file removed MFTyreToolApp.mlappinstall
Binary file not shown.
4 changes: 2 additions & 2 deletions MFTyreToolApp.prj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<deployment-project plugin="plugin.apptool" plugin-version="1.0">
<configuration build-checksum="40805343" file="C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreToolApp.prj" location="C:\Users\Tom\Documents\mftyre-tool-matlab" name="MFTyreToolApp" target="target.mlapps" target-name="Package App">
<configuration build-checksum="1939971157" file="C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreToolApp.prj" location="C:\Users\Tom\Documents\mftyre-tool-matlab" name="MFTyreToolApp" target="target.mlapps" target-name="Package App">
<param.appname>MFTyreToolApp</param.appname>
<param.authnamewatermark>Tom Teasdale</param.authnamewatermark>
<param.email>teasdale@lightsaber.red</param.email>
Expand All @@ -13,7 +13,7 @@
<param.summary>Create, fit and evaluate MF-Tyre model with a convenient MATLAB GUI.</param.summary>
<param.description />
<param.screenshot>${PROJECT_ROOT}\doc\img\MFTyreTool_Screenshot_Plot.png</param.screenshot>
<param.version>1.0.0</param.version>
<param.version>1.0.3</param.version>
<param.products.name>
<item>MATLAB</item>
</param.products.name>
Expand Down
151 changes: 151 additions & 0 deletions MFTyreToolToolboxPackager.prj
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
<configuration build-checksum="2760446424" file="C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreToolToolboxPackager.prj" location="C:\Users\Tom\Documents\mftyre-tool-matlab" name="MFTyreToolToolboxPackager" target="target.toolbox" target-name="Package Toolbox">
<param.appname>MFTyreTool</param.appname>
<param.authnamewatermark>Tom Teasdale</param.authnamewatermark>
<param.email>teasdale@lightsaber.red</param.email>
<param.company />
<param.summary>Create, fit and evaluate MF-Tyre models with a convenient MATLAB GUI.</param.summary>
<param.description />
<param.screenshot>${PROJECT_ROOT}\doc\img\MFTyreTool_Screenshot_Plot.png</param.screenshot>
<param.version>1.0.3</param.version>
<param.output>${PROJECT_ROOT}\MFTyreTool.mltbx</param.output>
<param.products.name />
<param.products.id />
<param.products.version />
<param.platforms />
<param.guid>e03fa972-2c80-4cb3-a454-b337725c641c</param.guid>
<param.exclude.filters>% List files contained in your toolbox folder that you would like to exclude
% from packaging. Excludes should be listed relative to the toolbox folder.
% Some examples of how to specify excludes are provided below:
%
% A single file in the toolbox folder:
% .svn
%
% A single file in a subfolder of the toolbox folder:
% example/.svn
%
% All files in a subfolder of the toolbox folder:
% example/*
%
% All files of a certain name in all subfolders of the toolbox folder:
% **/.svn
%
% All files matching a pattern in all subfolders of the toolbox folder:
% **/*.bak
%

.gitmodules
.gitignore
.git
sandbox
+tests
tools
resources
MFTyreToolApp_resources</param.exclude.filters>
<param.exclude.pcodedmfiles>true</param.exclude.pcodedmfiles>
<param.examples />
<param.demosxml />
<param.apps>
<file>${PROJECT_ROOT}\MFTyreToolApp.mlappinstall</file>
</param.apps>
<param.registered.apps />
<param.docs />
<param.getting.started.guide />
<param.matlabpath.excludes />
<param.javaclasspath.excludes />
<param.exported.on.package>false</param.exported.on.package>
<param.required.addons />
<param.matlab.project.id />
<param.matlab.project.name />
<param.release.start>R2021a</param.release.start>
<param.release.end>latest</param.release.end>
<param.release.current.only>false</param.release.current.only>
<param.compatiblity.windows>true</param.compatiblity.windows>
<param.compatiblity.macos>true</param.compatiblity.macos>
<param.compatiblity.linux>true</param.compatiblity.linux>
<param.compatiblity.matlabonline>false</param.compatiblity.matlabonline>
<param.installation.map />
<param.additional.sw.names />
<param.additional.sw.licenses />
<param.additional.sw.win.url />
<param.additional.sw.mac.url />
<param.additional.sw.linux.url />
<unset>
<param.authnamewatermark />
<param.email />
<param.company />
<param.description />
<param.output />
<param.products.name />
<param.products.id />
<param.products.version />
<param.platforms />
<param.exclude.pcodedmfiles />
<param.examples />
<param.demosxml />
<param.registered.apps />
<param.docs />
<param.getting.started.guide />
<param.matlabpath.excludes />
<param.javaclasspath.excludes />
<param.exported.on.package />
<param.required.addons />
<param.matlab.project.id />
<param.matlab.project.name />
<param.release.current.only />
<param.compatiblity.windows />
<param.compatiblity.macos />
<param.compatiblity.linux />
<param.installation.map />
<param.additional.sw.names />
<param.additional.sw.licenses />
<param.additional.sw.win.url />
<param.additional.sw.mac.url />
<param.additional.sw.linux.url />
</unset>
<fileset.rootdir>
<file>${PROJECT_ROOT}</file>
</fileset.rootdir>
<fileset.rootfiles>
<file>${PROJECT_ROOT}\CHANGELOG.md</file>
<file>${PROJECT_ROOT}\doc</file>
<file>${PROJECT_ROOT}\LICENSE</file>
<file>${PROJECT_ROOT}\MFTyreToolApp.mlappinstall</file>
<file>${PROJECT_ROOT}\README.md</file>
<file>${PROJECT_ROOT}\src</file>
</fileset.rootfiles>
<fileset.depfun.included />
<fileset.depfun.excluded />
<fileset.package />
<build-deliverables>
<file location="${PROJECT_ROOT}" name="MFTyreTool.mltbx" optional="false">C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreTool.mltbx</file>
</build-deliverables>
<workflow />
<matlab>
<root>C:\Program Files\MATLAB\R2021a</root>
<toolboxes>
<toolbox name="matlabcoder" />
</toolboxes>
<toolbox>
<matlabcoder>
<enabled>true</enabled>
</matlabcoder>
</toolbox>
</matlab>
<platform>
<unix>false</unix>
<mac>false</mac>
<windows>true</windows>
<win2k>false</win2k>
<winxp>false</winxp>
<vista>false</vista>
<linux>false</linux>
<solaris>false</solaris>
<osver>10.0</osver>
<os32>false</os32>
<os64>true</os64>
<arch>win64</arch>
<matlab>true</matlab>
</platform>
</configuration>
</deployment-project>
2 changes: 1 addition & 1 deletion src/about.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "MFTyreTool",
"Version": "1.0.3",
"Version": "1.0.4",
"Authors": [
"Tom Teasdale"
],
Expand Down
18 changes: 12 additions & 6 deletions tools/publishReleaseMFTyreTool.m
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
function publishReleaseMFTyreTool(version, title, changelogFile, packageFile, packagerFile)
function publishReleaseMFTyreTool(version, title, changelogFile, packageFile, packagerFile, packagerToolboxFile)
%PUBLISHRELEASEMFTYRETOOL Automatic release to GitHub
arguments
version char = getVersionFromAboutJSON
version char = getVersionFromAboutJSON()
title char = char.empty
changelogFile char {mustBeFile} = 'CHANGELOG.md'
packageFile char = 'MFTyreToolApp.mlappinstall'
packageFile char = 'MFTyreTool.mltbx'
packagerFile char = 'MFTyreToolApp.prj'
packagerToolboxFile char = 'MFTyreToolToolboxPackager.prj'
end
pattern = 'v' + digitsPattern() + '.' + digitsPattern() + '.' + digitsPattern();
versionInvalid = ~matches(version, pattern);
if versionInvalid
error('Invalid version pattern. Example: v1.0.1')
end

%Not needed, as version is synced with latest GitHub release
% updateVersionPackager(packagerFile, version)
updateVersionPackager(packagerFile, version)
matlab.apputil.package(packagerFile)
matlab.addons.toolbox.toolboxVersion(packagerToolboxFile, erase(version, 'v'));
matlab.addons.toolbox.packageToolbox(packagerToolboxFile);

if isempty(title)
title = version;
end

system('git add *')
system(sprintf('git commit -m "publish release %s"', version))
system('git push')

cmd = "gh release create %s --title %s --notes-file %s";
cmd = sprintf(cmd, version, title, changelogFile);
[status, cmdout] = system(cmd);
Expand All @@ -34,7 +40,7 @@ function publishReleaseMFTyreTool(version, title, changelogFile, packageFile, pa
cmd = sprintf(cmd, version, packageFile);
[status, cmdout] = system(cmd);
if status == 1
warning('Failed to upload packaged application. Command-Line output:')
warning('Failed to upload packaged toolbox. Command-Line output:')
disp(cmdout)
return
end
Expand Down

0 comments on commit 9dad82e

Please sign in to comment.