Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
aa8d3089
Commit
aa8d3089
authored
May 05, 2017
by
Carsten Rose
Browse files
NewVersion.md: commmit notes updated
Makefile: qfq-doc setVersion.sh: rename Setting.yml to Setting.cfg
parent
bbfc391d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
aa8d3089
...
...
@@ -24,6 +24,9 @@ qfq.zip:
clean
:
rm
-f
qfq_
$(PKG_VERSION)
.zip
update-qfq-doc
:
rsync
-av
--delete
--exclude
=
_make
--exclude
=
_static extension/Documentation/ ../qfq-doc/Documentation/
git-revision
:
make-dist-dir
echo
$(GIT_REVISION_LONG)
>
$(DISTDIR)
/revision.git
...
...
doc/NewVersion.md
View file @
aa8d3089
Neuer Build
===========
*
snpashot: Wird ein Tag vergeben der mit 'v' beginnt, erzeugt das automatisch ein Build in 'snapshot' (w3.math.uzh.ch/qfq)
*
nightly: Ein Commit in den den Masterbranch erzeugt automatisch in der Nacht ein 'nightly' Build (w3.math.uzh.ch/qfq)
*
CR commmitet immer in den Master Branch
*
release: Wird ein Tag vergeben (alle Branches) der mit 'v' beginnt, erzeugt das automatisch ein Build in 'snapshot' (https://w3.math.uzh.ch/qfq)
*
snpashot: Jeder Commit (egal welcher Branch) erzeugt einen Snapshot.
*
nightly: Nach einem Commit auf Branch 'master' wird um 23:55 'nightly' Build erstellt (https://w3.math.uzh.ch/qfq).
*
CR commmittet immer in den Master Branch
Neue Versionsnummer
===================
...
...
@@ -17,11 +18,11 @@ Neue Versionsnummer
2) In folgenden Files anpassen:
Auto:
./setVersion.sh MAJOR MINOR MICRO
Auto: ./setVersion.sh MAJOR MINOR MICRO
Manuell:
*
extension/Documentation/_make/conf.py: release, version
*
extension/Documentation/Settings.
yml
: version
*
extension/Documentation/Settings.
cfg
: version
*
extension/ext_emconf.php: version
3) Im Projektverzeichnis:
...
...
@@ -44,3 +45,13 @@ git push -u origin v0.17.0
7) In T3 Instanz Dokumentation rendern lassen.
T3 6.2: Admin Tools > Extension Manager > QFQ > Doku HTML: rechts oben 'Render Documentation'
Update Doku auf docs.typo3.org
==============================
https://docs.typo3.org/typo3cms/drafts/github/T3DocumentationStarter/Public-Info-053/
1) Im
`qfq`
Projektverzeichnis: make update-qfq-doc
2) In
`qfq-doc`
Projektverzeichnis wechseln und auf github einchechen:
git commit -a
git push # User: math-uzh, PW:
<kpit>
setVersion.sh
View file @
aa8d3089
...
...
@@ -9,16 +9,16 @@ ST="'"
function
confPy
()
{
FILE
=
extension/Documentation/_make/conf.py
sed
-i
-r
's/^\s*release\s*=.+$/release = '
"'"
$VERSION
"'"
'/g'
${
FILE
}
sed
-i
-r
's/^\s*version\s*=.+$/version = '
"'"
$SHORT
"'"
'/g'
${
FILE
}
sed
-i
-r
's/^\s*release\s*=.+$/release = '
"'"
$VERSION
"'"
'/g'
${
FILE
}
}
function
settings
Yml
()
{
function
settings
Cfg
()
{
FILE
=
"extension/Documentation/Settings.
yml
"
FILE
=
"extension/Documentation/Settings.
cfg
"
sed
-i
-r
's/^\s*version\s*
:
.+$/
version
: '
$VERSION
'/g'
${
FILE
}
sed
-i
-r
's/^\s*release\s*
:
.+$/
release
:
'
$VERSION
'/g'
${
FILE
}
sed
-i
-r
's/^\s*version\s*
=
.+$/version
= '
$SHORT
'/g'
${
FILE
}
sed
-i
-r
's/^\s*release\s*
=
.+$/release
=
'
$VERSION
'/g'
${
FILE
}
}
...
...
@@ -45,5 +45,5 @@ VERSION="$MAJOR.$MINOR.$MICRO"
SHORT
=
"
$MAJOR
.
$MINOR
"
confPy
settings
Yml
settings
Cfg
extEmConf
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment