Changed: Updated Makefile to add tag.

Changed paths:
 M CHANGES.txt
 M Contents.m
 M Makefile
 M doc/cat.html
 M doc/index.html

CHANGES.txt

@@ -1,4 +1,15 @@
 ------------------------------------------------------------------------
+r2167 | gaser | 2023-01-23 10:49:36
+
+Changed paths:
+ M CHANGES.txt
+ M Contents.m
+ M Makefile
+ M doc/cat.html
+ M doc/index.html
+
+Changed: Updated Makefile to add tag.
+------------------------------------------------------------------------
 r2166 | gaser | 2023-01-22 23:40:08
 
 Changed paths:

Contents.m

@@ -1,5 +1,5 @@
 % Computational Anatomy Toolbox
-% Version 2159 (CAT12.8.2) 2022-12-07
+% Version 2166 (CAT12.8.2) 2023-01-22
 % ______________________________________________________________________
 %
 % Christian Gaser, Robert Dahnke

Makefile

@@ -6,6 +6,7 @@ OLDVERSION="CAT12.8.1"
 NEWVERSION="CAT12.8.2"
 REVISION=`git rev-list --count HEAD`
 DATE=`git log --date short |grep "Date:"|head -1|cut -f2 -d':'|sed -e s'/ //g'`
+VERSION=`echo ${NEWVERSION} | sed -e 's/CAT//g'`
 
 ZIPFOLDER=/Users/gaser/matlab/cat12
 
@@ -76,6 +77,7 @@ docs:
 # update version numbers
 update: docs copy_longmode
 	-@git fetch
+	-@git tag -f v${VERSION} -m "Release version ${VERSION}"
 	-@echo '% Computational Anatomy Toolbox' > Contents.m
 	-@echo '% Version' ${REVISION}' ('${NEWVERSION}')' ${DATE} >> Contents.m
 	-@cat Contents_info.txt >> Contents.m
@@ -99,7 +101,7 @@ zip: update clean
 # scp release
 scp: docs zip
 	-@echo scp to http://${STARGET_HOST}/cat12/${ZIPFILE}
-	-@scp -P ${PORT} CHANGES.txt ${ZIPFOLDER}/${ZIPFILE} ${STARGET}
+	-@scp -O -P ${PORT} CHANGES.txt ${ZIPFOLDER}/${ZIPFILE} ${STARGET}
 	-@bash -c "ssh -p ${PORT} ${STARGET_HOST} ln -fs ${STARGET_FOLDER}/${ZIPFILE} ${STARGET_FOLDER}/cat12_latest.zip"
 
 # scp deployed versions
@@ -108,13 +110,13 @@ scp_precompile:
 	-@find ${PRECOMPILED} -type f -name .DS_Store -exec rm {} \;
 	-@chmod -R a+r,go-w ${PRECOMPILED}
 	-@find ${PRECOMPILED} -type f \( -name "*.sh" -o -name "spm12" \) -exec chmod a+x {} \;
-	-@for i in Linux Mac; do \
+	-@for i in Linux; do \
 	   mkdir -p ${NEWVERSION}_R2017b_MCR_$${i} ;\
 	   ln -s ${PRECOMPILED}/MCR_$${i}/*spm12* ${PRECOMPILED}/MCR_$${i}/readme.txt ${PRECOMPILED}/MCR_$${i}/MCR_v93.webloc ${NEWVERSION}_R2017b_MCR_$${i}/ ;\
 	   cp -r standalone ${NEWVERSION}_R2017b_MCR_$${i}/ ;\
 	   cp -r standalone ${PRECOMPILED}/MCR_$${i}/ ;\
 	   zip ${ZIPFOLDER}/${NEWVERSION}_R2017b_MCR_$${i}.zip -r ${NEWVERSION}_R2017b_MCR_$${i} ; \
-	   scp -P ${PORT} ${ZIPFOLDER}/${NEWVERSION}_R2017b_MCR_$${i}.zip  ${STARGET}; \
+	   scp -O -P ${PORT} ${ZIPFOLDER}/${NEWVERSION}_R2017b_MCR_$${i}.zip  ${STARGET}; \
 	   bash -c "ssh -p ${PORT} ${STARGET_HOST} ln -fs ${STARGET_FOLDER}/${NEWVERSION}_R2017b_MCR_$${i}.zip ${STARGET_FOLDER}/cat12_latest_R2017b_MCR_$${i}.zip"; \
 	done
 	-@rm -r ${NEWVERSION}_R2017b_MCR*
@@ -187,7 +189,7 @@ precompile:
 	-@echo    cd spm12/config
 	-@echo    spm_make_standalone
 #	-@echo    "Ubuntu 19.10 (run spm12_R2017b on paris to compile) : mv /Users/gaser/spm/standalone/spm12.ctf ${PRECOMPILED}/MCR_Linux/"
-	-@echo    "Ubuntu 17.10 (run spm12_R2017b on MacBook to compile) : mv /Users/gaser/spm/standalone/spm12.ctf ${PRECOMPILED}/MCR_Linux/"
+	-@echo    "Ubuntu 17.10 (run spm12_R2017b with desktop on MacBook to compile) : mv /Users/gaser/spm/standalone/spm12.ctf ${PRECOMPILED}/MCR_Linux/"
 	-@echo    "Windows 10: mv /Users/gaser/spm/standalone/spm12.[ce][tx][fe] ${PRECOMPILED}/MCR_Win/"
 	-@echo    "Mac OS (run spm12_R2017b): rm -rf ${PRECOMPILED}/MCR_Mac/spm12.app; mv /Users/gaser/spm/standalone/spm12.app ${PRECOMPILED}/MCR_Mac/"
 	-@echo    

doc/cat.html

@@ -9,7 +9,7 @@
 
     <div id="content">
       <br />
-      <p align="center" style="text-align:center;">This is <b>CAT12.8.2 (r2159) from 2022-12-07</b><br />You can update your copy of CAT12 here: <a href="matlab:cat_update(1);">Check for update</a>.<br />If you find any bug, please report them at <a href="mailto:[email protected]">[email protected]</a>.</p>
+      <p align="center" style="text-align:center;">This is <b>CAT12.8.2 (r2166) from 2023-01-22</b><br />You can update your copy of CAT12 here: <a href="matlab:cat_update(1);">Check for update</a>.<br />If you find any bug, please report them at <a href="mailto:[email protected]">[email protected]</a>.</p>
       <h1 style="text-align:center;"><img src="images/CAT.png" width=40% height=auto alt="CAT" ></h1>
 
       <hr />

doc/index.html

@@ -144,8 +144,8 @@ <h3>Changes in version CAT12.8.2 (2130)</h3>
                 <li>The CAT12 manual is now converted to HTML and merged with the online help to a single HTML file with interactive Matlab links that can be called in Matlab.</li>
                 <li>Added new thalamic nuclei <a class="function" href="matlab:cat_vol_display_label(struct('data',{{fullfile(fileparts(which('cat12')),'templates_MNI152NLin2009cAsym','Template_T1.nii'); fullfile(fileparts(which('cat12')),'templates_MNI152NLin2009cAsym','thalamic_nuclei.nii')}}))">atlas</a>.</li>
                 <li>Moved some rarely used CAT12 options to expert mode.</li>
-                <li>Added many new options to <a class="function" href="matlab:y=cat_surf_results;">visualize 3D (VBM) results</a> (e.g. new glass brain)</li>
-                <li>The tool to check <a class="function" href="matlab:spm_jobman('interactive','','spm.tools.cat.tools.check_homogeneity');">Sample Homogeneity</a>. has many new options and is now based on calculation of Z-score which is much faster for larger samples./li>
+                <li>Added many new options to <a class="function" href="matlab:y=cat_surf_results;">visualize 3D (VBM) results</a> (e.g. new glass brain).</li>
+                <li>The tool to check <a class="function" href="matlab:spm_jobman('interactive','','spm.tools.cat.tools.check_homogeneity');">Sample Homogeneity</a> has many new options and is now based on calculation of Z-score which is much faster for larger samples.</li>
                 <li>New <a class="function" href="matlab:spm_jobman('interactive','','spm.tools.cat.factorial_design');">Basic Models</a> to easier define cross-sectional and longitudinal statistical designs. Some unnecessary options have been removed compared to "Basic Models" in SPM12 and some useful options have been added.</li>
               </ul>
             </details>