Sun, 04 Feb 2018 11:14:20 +0100
adds tag conflict detection for dav-sync push
# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # # Copyright 2017 Olaf Wintermann. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # PANDOC=pandoc PFLAGS = -c davdoc.css -B header.html -A footer.html SRC = getting-started.md SRC += commands.md SRC += list.md SRC += get.md SRC += put.md SRC += mkdir.md SRC += remove.md SRC += copy.md SRC += move.md SRC += get-property.md SRC += set-property.md SRC += remove-property.md SRC += lock.md SRC += unlock.md SRC += info.md SRC += date.md SRC += configuration.md SRC += encryption.md SRC += add-repository.md SRC += list-repositories.md SRC += check-config.md SRC += introduction.md SRC += sync-commands.md SRC += pull.md SRC += push.md SRC += archive.md SRC += resolve-conflicts.md SRC += delete-conflicts.md SRC += trash-info.md SRC += empty-trash.md SRC += add-directory.md SRC += list-directories.md SRC += sync-check-config.md SRC += check-repositories.md SRC += sync-configuration.md HTML = $(SRC:%.md=build/%.html) FILES = build/davdoc.css build/index.html all: doc doc: build $(HTML) $(FILES) build: mkdir -p build build/%.html: %.md $(PANDOC) $(PFLAGS) $< -o $@ build/davdoc.css: cp davdoc.css build build/index.html: cp index.html build dist: doc rm -Rf ../html; cp -R build ../html clean: rm -Rf build