Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bjcp-2015-styleguide
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Frank Steinberg
bjcp-2015-styleguide
Commits
f06cc440
Commit
f06cc440
authored
5 years ago
by
Frank Steinberg
Browse files
Options
Downloads
Patches
Plain Diff
Minor.
parent
41c9db1e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+4
-0
4 additions, 0 deletions
Makefile
web/save.cgi
+4
-6
4 additions, 6 deletions
web/save.cgi
with
8 additions
and
6 deletions
Makefile
+
4
−
0
View file @
f06cc440
...
@@ -48,6 +48,10 @@ check: bjcp-2015-styleguide-orig.xml bjcp-2015-styleguide-de.xml
...
@@ -48,6 +48,10 @@ check: bjcp-2015-styleguide-orig.xml bjcp-2015-styleguide-de.xml
@
xmllint
--noout
--schema
xsd/bjcp-styleguide-2015.xsd bjcp-2015-styleguide-orig.xml
@
xmllint
--noout
--schema
xsd/bjcp-styleguide-2015.xsd bjcp-2015-styleguide-orig.xml
@
xmllint
--noout
--schema
xsd/bjcp-styleguide-2015.xsd bjcp-2015-styleguide-de.xml
@
xmllint
--noout
--schema
xsd/bjcp-styleguide-2015.xsd bjcp-2015-styleguide-de.xml
background
:
@
echo
"updating in the background..."
@
if
[
!
-e
.background
]
;
then
touch
.background
;
rm
-f
.background-again bjcp-2015-styleguide-de.xml web/edit.html
;
make web/edit.html
;
rm
.background
;
if
[
-e
.background-again
]
;
then
rm
bjcp-2015-styleguide-de.xml web/edit.html
;
make background
;
fi
;
else
touch
.background-again
;
fi
&
install
:
install
:
ssh z
"cd /var/www ; if [ -d bjcp-2015-styleguide ] ; then cd bjcp-2015-styleguide ; git pull ; else git clone https://github.com/frsteinb/bjcp-2015-styleguide.git ; cd bjcp-2015-styleguide ; mkdir web/snippets ; sudo chgrp -R www-data . ; sudo chmod g+ws . web web/snippets ; make ; fi"
ssh z
"cd /var/www ; if [ -d bjcp-2015-styleguide ] ; then cd bjcp-2015-styleguide ; git pull ; else git clone https://github.com/frsteinb/bjcp-2015-styleguide.git ; cd bjcp-2015-styleguide ; mkdir web/snippets ; sudo chgrp -R www-data . ; sudo chmod g+ws . web web/snippets ; make ; fi"
...
...
This diff is collapsed.
Click to expand it.
web/save.cgi
+
4
−
6
View file @
f06cc440
...
@@ -113,18 +113,16 @@ if os.path.isfile(translatedfilename):
...
@@ -113,18 +113,16 @@ if os.path.isfile(translatedfilename):
log
(
"
updating translation file %s/%s.xml based on snippet
"
%
(
LANG
,
id
))
log
(
"
updating translation file %s/%s.xml based on snippet
"
%
(
LANG
,
id
))
cmd
=
"
xsltproc --stringparam snippet %s %s/xsl/bjcp-2015-styleguide-merge.xsl %s > %s.tmp ; mv %s.tmp %s
"
%
(
snippetfilename
,
DIR
,
translatedfilename
,
translatedfilename
,
translatedfilename
,
translatedfilename
)
cmd
=
"
xsltproc --stringparam snippet %s %s/xsl/bjcp-2015-styleguide-merge.xsl %s > %s.tmp ; mv %s.tmp %s
"
%
(
snippetfilename
,
DIR
,
translatedfilename
,
translatedfilename
,
translatedfilename
,
translatedfilename
)
os
.
system
(
cmd
)
os
.
system
(
cmd
)
log
(
"
updating
all
files
(may take a minute)
"
)
log
(
"
updating files
in the background...
"
)
cmd
=
"
make -C %s
"
%
DIR
cmd
=
"
make -C %s
background
"
%
DIR
os
.
system
(
cmd
)
os
.
system
(
cmd
)
log
(
"
done
"
)
elif
os
.
path
.
isfile
(
origfilename
):
elif
os
.
path
.
isfile
(
origfilename
):
log
(
"
creating new translation file %s/%s.xml from orig/%s.xml and snippet
"
%
(
LANG
,
id
,
id
))
log
(
"
creating new translation file %s/%s.xml from orig/%s.xml and snippet
"
%
(
LANG
,
id
,
id
))
cmd
=
"
xsltproc --stringparam snippet %s %s/xsl/bjcp-2015-styleguide-merge.xsl %s > %s
"
%
(
snippetfilename
,
DIR
,
origfilename
,
translatedfilename
)
cmd
=
"
xsltproc --stringparam snippet %s %s/xsl/bjcp-2015-styleguide-merge.xsl %s > %s
"
%
(
snippetfilename
,
DIR
,
origfilename
,
translatedfilename
)
os
.
system
(
cmd
)
os
.
system
(
cmd
)
log
(
"
updating
all
files
(may take a minute)
"
)
log
(
"
updating files
in the background...
"
)
cmd
=
"
nohup
make -C %s
&
"
%
DIR
cmd
=
"
make -C %s
background
"
%
DIR
os
.
system
(
cmd
)
os
.
system
(
cmd
)
log
(
"
done
"
)
else
:
else
:
log
(
"
neither orig file %s nor translated file %s for id %s exists
"
%
(
origfilename
,
translatedfilename
,
id
))
log
(
"
neither orig file %s nor translated file %s for id %s exists
"
%
(
origfilename
,
translatedfilename
,
id
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment