Skip to content

Commit

Permalink
Version - .
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomlourenco committed Jan 23, 2025
1 parent 6cc1d3a commit 38354b7
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 9 deletions.
36 changes: 28 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ZIPTARGET=$(B)-$(VERSION)@$(DATE).zip

# extract version and date of the template
VERSION=$(shell head -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/')
DATE:=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/')
DATE=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/')

# aux files
AUXFILES:=$(shell ls $(B)*.* | fgrep -v .tex | fgrep -v .pdf | sed 's: :\\ :g' | sed 's:(:\\(:g' | sed 's:):\\):g')
Expand Down Expand Up @@ -187,7 +187,19 @@ endif
#————————————————————————————————————————————————————————————————————————————
.PHONY: mtp
mtp:
@$(call mtp)
VERSIONMTP=$(shell head -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/')
DATEMTP=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/')
make clean
echo "VERSION IS $(VERSIONMTP) - - $(DATEMTP)."
git commit --all --message "Version $(VERSIONMTP) - $(DATEMTP)." || true
git checkout main
git reset template.pdf
git pull
git merge -m "Merge branch 'develop'" develop
git tag -f -a "v$(VERSIONMTP)" -m "Version $(VERSIONMTP) - $(DATEMTP)."
git push --all
git push -f --tags
git checkout develop



Expand Down Expand Up @@ -220,10 +232,23 @@ endif

# merge, tag and push
define mtp
VERSIONMTP="$(shell echo aaa)"
# DATEMTP=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/')
make clean
echo "VERSION IS $(VERSIONMTP) - - $(DATEMTP)."
endef


run:
@ eval "$$script"



x:
VERSIONMTP=$(shell head -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/')
DATEMTP=$(shell tail -1 NOVAthesisFiles/nt-version.sty | sed -e 's/.*{//' -e 's/\(.*\)./\1/' | tr '\n' '@'m| sed -e 's/\(.*\)./\1/')
make clean
echo "VERSION IS $(VERSIONMTP)"
echo "VERSION IS $(VERSIONMTP) - - $(DATEMTP)."
git commit --all --message "Version $(VERSIONMTP) - $(DATEMTP)." || true
git checkout main
git reset template.pdf
Expand All @@ -233,8 +258,3 @@ define mtp
git push --all
git push -f --tags
git checkout develop
endef


run:
@ eval "$$script"
2 changes: 1 addition & 1 deletion NOVAthesisFiles/nt-version.sty
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
\newcommand*{\novathesisversion}{7.3.2}
\newcommand*{\novathesisversion}{7.3.1}
\newcommand*{\novathesisdate}{2025-01-23}

0 comments on commit 38354b7

Please sign in to comment.