Skip to content

Commit 981500c

Browse files
committed
Merge branch 'develop'
2 parents 9834fed + cc7066a commit 981500c

File tree

203 files changed

+33243
-105
lines changed

Some content is hidden

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

203 files changed

+33243
-105
lines changed

IPOPT-toolbox.prj

100644100755
Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
2-
<configuration build-checksum="1108983496" file="/Users/enrico/Ricerca/develop/myReposProjects/mexIPOPT/IPOPT-toolbox.prj" location="/Users/enrico/Ricerca/develop/myReposProjects/mexIPOPT" name="IPOPT-toolbox" target="target.toolbox" target-name="Package Toolbox">
2+
<configuration build-checksum="1276318946" file="C:\Users\NUC2\mexIPOPT\IPOPT-toolbox.prj" location="C:\Users\NUC2\mexIPOPT" name="IPOPT-toolbox" target="target.toolbox" target-name="Package Toolbox">
33
<param.appname>IPOPT-toolbox</param.appname>
44
<param.authnamewatermark>Enrico Bertolazzi</param.authnamewatermark>
55
<param.email>[email protected]</param.email>
66
<param.company>University of Trento</param.company>
77
<param.summary>Toolbox for MATLAB interfacing with IPOPT</param.summary>
8-
<param.description />
9-
<param.screenshot>${PROJECT_ROOT}/toolbox/screenshot.png</param.screenshot>
10-
<param.version>1.1.2</param.version>
11-
<param.output>${PROJECT_ROOT}/IPOPT-toolbox.mltbx</param.output>
8+
<param.description>Toolbox for MATLAB interfacing with IPOPT</param.description>
9+
<param.screenshot>${PROJECT_ROOT}\toolbox\screenshot.png</param.screenshot>
10+
<param.version>1.1.3</param.version>
11+
<param.output>${PROJECT_ROOT}\IPOPT-toolbox.mltbx</param.output>
1212
<param.products.name />
1313
<param.products.id />
1414
<param.products.version />
@@ -40,7 +40,7 @@
4040
<param.apps />
4141
<param.registered.apps />
4242
<param.docs />
43-
<param.getting.started.guide>${PROJECT_ROOT}/toolbox/doc/GettingStarted.mlx</param.getting.started.guide>
43+
<param.getting.started.guide>${PROJECT_ROOT}\toolbox\doc\GettingStarted.mlx</param.getting.started.guide>
4444
<param.matlabpath.excludes />
4545
<param.javaclasspath.excludes />
4646
<param.exported.on.package>false</param.exported.on.package>
@@ -61,9 +61,6 @@
6161
<param.additional.sw.mac.url />
6262
<param.additional.sw.linux.url />
6363
<unset>
64-
<param.authnamewatermark />
65-
<param.email />
66-
<param.description />
6764
<param.output />
6865
<param.products.name />
6966
<param.products.id />
@@ -96,44 +93,44 @@
9693
<param.additional.sw.linux.url />
9794
</unset>
9895
<fileset.rootdir>
99-
<file>${PROJECT_ROOT}/toolbox</file>
96+
<file>${PROJECT_ROOT}\toolbox</file>
10097
</fileset.rootdir>
10198
<fileset.rootfiles>
102-
<file>${PROJECT_ROOT}/toolbox/CompileIpoptMexLib.m</file>
103-
<file>${PROJECT_ROOT}/toolbox/bin</file>
104-
<file>${PROJECT_ROOT}/toolbox/demos.xml</file>
105-
<file>${PROJECT_ROOT}/toolbox/doc</file>
106-
<file>${PROJECT_ROOT}/toolbox/examples</file>
107-
<file>${PROJECT_ROOT}/toolbox/lib</file>
108-
<file>${PROJECT_ROOT}/toolbox/license.txt</file>
109-
<file>${PROJECT_ROOT}/toolbox/screenshot.png</file>
110-
<file>${PROJECT_ROOT}/toolbox/setup.m</file>
111-
<file>${PROJECT_ROOT}/toolbox/src</file>
99+
<file>${PROJECT_ROOT}\toolbox\bin</file>
100+
<file>${PROJECT_ROOT}\toolbox\CompileIpoptMexLib.m</file>
101+
<file>${PROJECT_ROOT}\toolbox\demos.xml</file>
102+
<file>${PROJECT_ROOT}\toolbox\doc</file>
103+
<file>${PROJECT_ROOT}\toolbox\examples</file>
104+
<file>${PROJECT_ROOT}\toolbox\lib</file>
105+
<file>${PROJECT_ROOT}\toolbox\license.txt</file>
106+
<file>${PROJECT_ROOT}\toolbox\screenshot.png</file>
107+
<file>${PROJECT_ROOT}\toolbox\setupIpoptPath.m</file>
108+
<file>${PROJECT_ROOT}\toolbox\src</file>
112109
</fileset.rootfiles>
113110
<fileset.depfun.included />
114111
<fileset.depfun.excluded />
115112
<fileset.package />
116113
<build-deliverables>
117-
<file location="${PROJECT_ROOT}" name="IPOPT-toolbox.mltbx" optional="false">/Users/enrico/Ricerca/develop/myReposProjects/mexIPOPT/IPOPT-toolbox.mltbx</file>
114+
<file location="${PROJECT_ROOT}" name="IPOPT-toolbox.mltbx" optional="false">C:\Users\NUC2\mexIPOPT\IPOPT-toolbox.mltbx</file>
118115
</build-deliverables>
119116
<workflow />
120117
<matlab>
121-
<root>/Applications/MATLAB_R2020b.app</root>
118+
<root>C:\Program Files\MATLAB\R2020a</root>
122119
<toolboxes />
123120
</matlab>
124121
<platform>
125-
<unix>true</unix>
126-
<mac>true</mac>
127-
<windows>false</windows>
122+
<unix>false</unix>
123+
<mac>false</mac>
124+
<windows>true</windows>
128125
<win2k>false</win2k>
129126
<winxp>false</winxp>
130127
<vista>false</vista>
131128
<linux>false</linux>
132129
<solaris>false</solaris>
133-
<osver>10.15.7</osver>
130+
<osver>10.0</osver>
134131
<os32>false</os32>
135132
<os64>true</os64>
136-
<arch>maci64</arch>
133+
<arch>win64</arch>
137134
<matlab>true</matlab>
138135
</platform>
139136
</configuration>

0 commit comments

Comments
 (0)