From 8a9675a3157cf82372201c6c60a393d18e413d6a Mon Sep 17 00:00:00 2001 From: Christian Kern Date: Mon, 29 Jun 2015 16:27:04 +0200 Subject: [PATCH] Revert "Create tarball script must be adjusted...." This reverts commit 20174ac11949f0ebb83853e327c98783fe8ac004. --- scripts/create_tarball.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/create_tarball.sh b/scripts/create_tarball.sh index dbb9eef..a91846d 100755 --- a/scripts/create_tarball.sh +++ b/scripts/create_tarball.sh @@ -283,9 +283,9 @@ REFMAN_SOURCE="$MYTMPDIR_DOXY_BUILD/latex/refman.pdf" echo "--> Integrating Example Snippets" REMEMBER_CUR_DIR=$(pwd) -EXAMPLES_DIR="$MYTMPDIR_BUILD/doc/examples_raw" +EXAMPLES_DIR="$MYTMPDIR_BUILD/doc/examples" INTEGRATE_SNIPPETS_SCRIPT="insert_snippets.py" -EXAMPLES_TARGET_DIR="$MYTMPDIR/${n}/doc/examples" +EXAMPLES_TARGET_DIR="$MYTMPDIR/${n}/doc/" if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then cd "$EXAMPLES_DIR" @@ -293,16 +293,11 @@ if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then echo "---> Calling integrate script" redirect_cmd python insert_snippets.py - - if [ ! -d $EXAMPLES_TARGET_DIR ]; then - echo "---> Examples target dir does not exist. Creating..." - redirect_cmd mkdir $EXAMPLES_TARGET_DIR - fi if [ -d $EXAMPLES_TARGET_DIR ]; then echo "---> Copy integrated examples back" #The examples have been integrated. Copy the integrated source files. - redirect_cmd rsync --archive --recursive "$EXAMPLES_DIR/" "$EXAMPLES_TARGET_DIR/" \ + redirect_cmd rsync --archive --recursive $EXAMPLES_DIR $EXAMPLES_TARGET_DIR \ --exclude=*snippet.h \ --exclude=*fragmented.h \ --exclude=*snippet.cc \ -- libgit2 0.26.0