mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

docs: Bump common. Use upload-doc.mak instead of upload.mak

Browse source 
Remove the local copy of upload.mak in favour of using the shared
upload-doc.make in common/
This commit is contained in:
Jan Schmidt 2009-06-11 13:32:22 +01:00
parent 6d32642887
commit c6c769aa8a
4 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit c57272152d5c40617fab305d839db1b1fefe0ea0 Subproject commit f3bb51b867ff403f70d36fc772861d8e57c703ed

1
docs/Makefile.am
View file

@ -9,7 +9,6 @@ DIST_SUBDIRS = plugins
EXTRA_DIST = \ EXTRA_DIST = \
random/ChangeLog-0.8 \ random/ChangeLog-0.8 \
upload.mak \
version.entities.in version.entities.in
upload: upload:

4
docs/plugins/Makefile.am
View file

@ -7,11 +7,11 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
MODULE=gst-plugins-good MODULE=gst-plugins-good
DOC_MODULE=$(MODULE)-plugins DOC_MODULE=$(MODULE)-plugins
# for upload.mak # for upload-doc.mak
DOC=$(MODULE)-plugins DOC=$(MODULE)-plugins
FORMATS=html FORMATS=html
html: html-build.stamp html: html-build.stamp
include $(srcdir)/../upload.mak include $(top_srcdir)/common/upload-doc.mak
# generated basefiles # generated basefiles
#basefiles = \ #basefiles = \

35
docs/upload.mak
View file

@ -1,35 +0,0 @@
# this snippet is to be included by both our docbook manuals
# and gtk-doc API references
# it adds an upload target to each of these dir's Makefiles
# each Makefile.am should define the following variables:
# - DOC: the base name of the documentation
# (faq, manual, pwg, gstreamer, gstreamer-libs)
# - FORMATS: the formats in which DOC is output
# (html ps pdf)
# if you want to use it, make sure your ..sh/config file contains the
# correct User entry for the Host entry for the DOC_SERVER
# these variables define the location of the online docs
DOC_SERVER=gstreamer.freedesktop.org
DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
DOC_URL=$(DOC_SERVER):$(DOC_BASE)
GST_VERSION_NANO = $(GST_PLUGINS_GOOD_VERSION_NANO)
upload: $(FORMATS)
@if test "x$(GST_VERSION_NANO)" = x0; then \
export DOCVERSION=$(VERSION); \
else export DOCVERSION=head; \
fi; \
export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
ssh $(DOC_SERVER) mkdir -p $$DIR; \
if echo $(FORMATS) | grep html > /dev/null; then export SRC="$$SRC html"; fi; \
if echo $(FORMATS) | grep ps > /dev/null; then export SRC="$$SRC $(DOC).ps"; fi; \
if echo $(FORMATS) | grep pdf > /dev/null; then export SRC="$$SRC $(DOC).pdf"; fi; \
echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
echo Done