Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CA3BC200B4A for ; Tue, 5 Jul 2016 22:12:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C904A160A60; Tue, 5 Jul 2016 20:12:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1D374160A2C for ; Tue, 5 Jul 2016 22:12:05 +0200 (CEST) Received: (qmail 19936 invoked by uid 500); 5 Jul 2016 20:12:05 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 19927 invoked by uid 99); 5 Jul 2016 20:12:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 20:12:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id CFDCA1806EA for ; Tue, 5 Jul 2016 20:12:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.426 X-Spam-Level: X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ea3zlv92KY4L for ; Tue, 5 Jul 2016 20:12:02 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 7C0295F2C3 for ; Tue, 5 Jul 2016 20:12:02 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 91928E0454 for ; Tue, 5 Jul 2016 20:12:01 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 422483A023B for ; Tue, 5 Jul 2016 20:12:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1751548 - /directory/studio/trunk/dist/dist.sh Date: Tue, 05 Jul 2016 20:12:00 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160705201201.422483A023B@svn01-us-west.apache.org> archived-at: Tue, 05 Jul 2016 20:12:07 -0000 Author: seelmann Date: Tue Jul 5 20:12:00 2016 New Revision: 1751548 URL: http://svn.apache.org/viewvc?rev=1751548&view=rev Log: Adapt dist script to new folder structure Modified: directory/studio/trunk/dist/dist.sh Modified: directory/studio/trunk/dist/dist.sh URL: http://svn.apache.org/viewvc/directory/studio/trunk/dist/dist.sh?rev=1751548&r1=1751547&r2=1751548&view=diff ============================================================================== --- directory/studio/trunk/dist/dist.sh (original) +++ directory/studio/trunk/dist/dist.sh Tue Jul 5 20:12:00 2016 @@ -35,25 +35,10 @@ if [ -e "$TARGET_DIR" ]; then fi echo -echo "### Creating dist folders" +echo "### Creating dist folder" DIST_DIR=${TARGET_DIR}/${VERSION} -UPDATE_SITE_DIR=${TARGET_DIR}/update/${VERSION} mkdir -p ${DIST_DIR} -mkdir -p ${UPDATE_SITE_DIR} - -echo -echo "### Copying update sites" -cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies -cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse -echo -echo "### Signing update sites" -cd ${UPDATE_SITE_DIR}/dependencies -sh ${WORK_DIR}/sign.sh -zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip * -cd ${UPDATE_SITE_DIR}/eclipse -sh ${WORK_DIR}/sign.sh -zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip * echo echo "### Copying dist files" @@ -88,5 +73,23 @@ echo "### Signing dist files" sh ${WORK_DIR}/sign.sh echo +echo "### Copying update sites" +UPDATE_SITE_DIR=${TARGET_DIR}/${VERSION}/update +mkdir -p ${UPDATE_SITE_DIR} +cd ${WORK_DIR} +cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies +cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse + +echo +echo "### Signing update sites" +cd ${UPDATE_SITE_DIR}/dependencies +sh ${WORK_DIR}/sign.sh +zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip * +cd ${UPDATE_SITE_DIR}/eclipse +sh ${WORK_DIR}/sign.sh +zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip * + + +echo echo "### Success"