You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2018/09/09 11:22:19 UTC
[directory-studio] branch master updated (a465a26 -> 56aa07f)
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git.
from a465a26 More copyright years to update
new 4fe1785 Fix file names of generated PDFs
new 44aa7eb Distribute user guides
new 56aa07f Update release process
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 66 +++++++++++++++++++++++++----------------
dist/dist.sh | 29 ++++++++++++++++--
helps/apacheds.help/pom.xml | 4 +++
helps/ldapbrowser.help/pom.xml | 4 +++
helps/ldifeditor.help/pom.xml | 4 +++
helps/pom.xml | 2 +-
helps/rcp.help/pom.xml | 4 +++
helps/schemaeditor.help/pom.xml | 4 +++
8 files changed, 88 insertions(+), 29 deletions(-)
[directory-studio] 03/03: Update release process
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit 56aa07f21259343d46c2bb68695c101c18c6e2d5
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Sep 9 13:21:35 2018 +0200
Update release process
* Update to git
* Codesign of macOS DMG
* Publish user guides
---
README.md | 66 ++++++++++++++++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index fc4b4a4..20789b1 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Build the main eclipse artifacts using Tycho
#### Use the script (which runs the two previous commands)
-On Linux / Mac OS X :
+On Linux / macOS :
$ ./build.sh
@@ -136,7 +136,7 @@ We release the following artifacts:
* Product archives and installers for
* Linux GTK 32bit tar.gz
* Linux GTK 64bit tar.gz
- * Mac OS X 64bit dmg
+ * maxOS 64bit dmg
* Windows 32bit exe installer and zip
* Windows 64bit exe installer and zip
* Userguides
@@ -147,11 +147,13 @@ We release the following artifacts:
Update the copyright year, see <http://svn.apache.org/viewvc?rev=1807191&view=rev>
for the list of files that need to be changed.
-Test the release build: rat check, javadoc and source jar generation, GPG signing, userguide generation
+Test the release build: rat check, javadoc and source jar generation, installer generation, GPG signing, userguide generation
mvn -f pom-first.xml clean install
mvn -Papache-release,windows,macos -Duserguides clean install
+Note: During creation of the macOS installer (DMG) the ApacheDirectoryStudio.app is signed with the ASF "Developer ID Application" key. See https://issues.apache.org/jira/browse/INFRA-16978 for the process to get one.
+
Run UI tests (if possible on all platforms)
mvn clean install -Denable-ui-tests
@@ -173,16 +175,10 @@ Define a variable for later use:
export VERSION=2.0.0.v20150529-M9
-Also create an empty directory used during the release process and store it in a variable:
-
- export RELEASE_DIR=$(pwd)
-
#### Create and checkout branch
- cd $RELEASE_DIR
- svn copy https://svn.apache.org/repos/asf/directory/studio/trunk https://svn.apache.org/repos/asf/directory/studio/branches/$VERSION -m "Prepare release $VERSION"
- svn checkout https://svn.apache.org/repos/asf/directory/studio/branches/$VERSION branch-$VERSION
- cd branch-$VERSION
+ git checkout -b $VERSION-prepare
+ git push origin $VERSION-prepare
#### Remove OpenLDAP feature
@@ -194,16 +190,24 @@ As long as the `org.apache.directory.studio.openldap.feature` is not ready for r
find . -name pom-first.xml | xargs sed -i 's/2.0.0.qualifier/'$VERSION'/'
sed -i 's/2.0.0-SNAPSHOT/'$VERSION'/' pom.xml
mvn -f pom-first.xml clean install
- svn revert pom.xml
- mvn org.eclipse.tycho:tycho-versions-plugin:0.24.0:set-version -DnewVersion=$VERSION
- svn commit -m "Set version number for release $VERSION"
+ git checkout pom.xml
+ mvn org.eclipse.tycho:tycho-versions-plugin:1.2.0:set-version -DnewVersion=$VERSION
+ git commit -m "Set version number for release $VERSION"
+ git push origin $VERSION-prepare
+
+#### Create the release tag
-#### Create and checkout tag
+ git tag $VERSION
+ git push origin $VERSION
- cd $RELEASE_DIR
- svn copy https://svn.apache.org/repos/asf/directory/studio/branches/$VERSION https://svn.apache.org/repos/asf/directory/studio/tags/$VERSION -m "Tag release $VERSION"
- svn checkout https://svn.apache.org/repos/asf/directory/studio/tags/$VERSION tag-$VERSION
- cd tag-$VERSION
+#### Clone the repo and checkout the tag into a fresh directory
+
+Run the actual release within a fresh checkout to ensure no previous build artifacts are used.
+
+ mkdir studio-release
+ cd studio-release
+ git clone https://gitbox.apache.org/repos/asf/directory-studio.git .
+ git checkout $VERSION
#### Build the release and deploy to staging Nexus repository
@@ -227,15 +231,29 @@ Run the dist script:
cd dist
./dist.sh
-Afterwards all distribution packages are located in `target`.
+Afterwards all distribution packages and user guides are located in `target`.
-#### Upload the artifacts to SVN
+#### Upload the distribution packages to SVN
- cd target/$VERSION
+ cd target/dist/$VERSION
svn mkdir https://dist.apache.org/repos/dist/dev/directory/studio/$VERSION -m "Create dev area for release $VERSION"
svn co https://dist.apache.org/repos/dist/dev/directory/studio/$VERSION .
svn add *
svn commit -m "Add release $VERSION"
+ cd ../..
+
+#### Upload the user guides to SVN
+
+ cd target/ug/$VERSION
+ svn mkdir https://svn.apache.org/repos/infra/websites/production/directory/content/studio/users-guide/$VERSION -m "Create user guides area for release $VERSION"
+ svn co https://svn.apache.org/repos/infra/websites/production/directory/content/studio/users-guide/$VERSION .
+ svn add *
+ svn commit -m "Add release $VERSION"
+ cd ../..
+
+Note: This publishes the user guides directly to the production CMS!
+
+Also update the `content/extpaths.txt` and whitelist the new version.
### Call the vote
@@ -287,10 +305,6 @@ Add release to <https://reporter.apache.org/?directory>
Send the release announce email.
-#### User guides
-
-TODO
-
#### Cleanup
Delete old releases from `https://dist.apache.org/repos/dist/release/directory/studio/`, ensure they were already archived to `https://archive.apache.org/dist/directory/studio/`.
[directory-studio] 01/03: Fix file names of generated PDFs
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit 4fe17857b78e700afee32c5fbc1723e07354e426
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Sep 9 13:05:18 2018 +0200
Fix file names of generated PDFs
---
helps/apacheds.help/pom.xml | 4 ++++
helps/ldapbrowser.help/pom.xml | 4 ++++
helps/ldifeditor.help/pom.xml | 4 ++++
helps/pom.xml | 2 +-
helps/rcp.help/pom.xml | 4 ++++
helps/schemaeditor.help/pom.xml | 4 ++++
6 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/helps/apacheds.help/pom.xml b/helps/apacheds.help/pom.xml
index fec42fd..167d698 100644
--- a/helps/apacheds.help/pom.xml
+++ b/helps/apacheds.help/pom.xml
@@ -31,4 +31,8 @@
<name>Apache Directory Studio Apache DS Help</name>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <pdf.filename>Apache_Directory_Studio_Apache_DS_User_Guide.pdf</pdf.filename>
+ </properties>
+
</project>
diff --git a/helps/ldapbrowser.help/pom.xml b/helps/ldapbrowser.help/pom.xml
index fa5d0a5..d768c64 100644
--- a/helps/ldapbrowser.help/pom.xml
+++ b/helps/ldapbrowser.help/pom.xml
@@ -31,4 +31,8 @@
<name>Apache Directory Studio LDAP Browser Help</name>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <pdf.filename>Apache_Directory_Studio_LDAP_Browser_User_Guide.pdf</pdf.filename>
+ </properties>
+
</project>
diff --git a/helps/ldifeditor.help/pom.xml b/helps/ldifeditor.help/pom.xml
index 57e88df..b803848 100644
--- a/helps/ldifeditor.help/pom.xml
+++ b/helps/ldifeditor.help/pom.xml
@@ -31,4 +31,8 @@
<name>Apache Directory Studio LDIF Editor Help</name>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <pdf.filename>Apache_Directory_Studio_LDIF_Editor_User_Guide.pdf</pdf.filename>
+ </properties>
+
</project>
diff --git a/helps/pom.xml b/helps/pom.xml
index 0ef4c9c..354ea94 100644
--- a/helps/pom.xml
+++ b/helps/pom.xml
@@ -227,7 +227,7 @@
<outputproperty name="encoding" value="iso8859_1" />
<outputproperty name="indent" value="es" />
</xslt>
- <fop format="application/pdf" basedir="target/pdf" fofile="target/pdf/${project.artifactId}.fo" outfile="target/pdf/${project.name}.pdf" />
+ <fop format="application/pdf" basedir="target/pdf" fofile="target/pdf/${project.artifactId}.fo" outfile="target/pdf/${pdf.filename}" />
<!-- Create HTML -->
<xslt in="target/docbook/documents/0_index.xml" out="target/html/index.html" style="target/docbook/docbook-xsl/html/chunk.xsl">
diff --git a/helps/rcp.help/pom.xml b/helps/rcp.help/pom.xml
index 4512946..9bf384b 100644
--- a/helps/rcp.help/pom.xml
+++ b/helps/rcp.help/pom.xml
@@ -31,4 +31,8 @@
<name>Apache Directory Studio RCP Help</name>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <pdf.filename>Apache_Directory_Studio_User_Guide.pdf</pdf.filename>
+ </properties>
+
</project>
diff --git a/helps/schemaeditor.help/pom.xml b/helps/schemaeditor.help/pom.xml
index 12a09e6..d18db57 100644
--- a/helps/schemaeditor.help/pom.xml
+++ b/helps/schemaeditor.help/pom.xml
@@ -31,4 +31,8 @@
<name>Apache Directory Studio Schema Editor Help</name>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <pdf.filename>Apache_Directory_Studio_Schema_Editor_User_Guide.pdf</pdf.filename>
+ </properties>
+
</project>
\ No newline at end of file
[directory-studio] 02/03: Distribute user guides
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit 44aa7eb9f532a4dc1ee5b63f1c69245f9b870d12
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Sep 9 13:07:20 2018 +0200
Distribute user guides
---
dist/dist.sh | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/dist/dist.sh b/dist/dist.sh
index 1e6f897..50f64cd 100755
--- a/dist/dist.sh
+++ b/dist/dist.sh
@@ -36,7 +36,7 @@ fi
echo
echo "### Creating dist folder"
-DIST_DIR=${TARGET_DIR}/${VERSION}
+DIST_DIR=${TARGET_DIR}/dist/${VERSION}
mkdir -p ${DIST_DIR}
@@ -88,7 +88,7 @@ sh ${WORK_DIR}/sign.sh
echo
echo "### Copying update sites"
-UPDATE_SITE_DIR=${TARGET_DIR}/${VERSION}/update
+UPDATE_SITE_DIR=${DIST_DIR}/update
mkdir -p ${UPDATE_SITE_DIR}
cd ${WORK_DIR}
cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies
@@ -105,5 +105,30 @@ sh ${WORK_DIR}/sign.sh
echo
+echo "### Creating user's guide folder"
+UG_DIR=${TARGET_DIR}/ug/${VERSION}
+mkdir -p ${UG_DIR}
+
+echo
+echo "### Copying user's guide files"
+cd ${WORK_DIR}
+mkdir -p ${UG_DIR}/apache_directory_studio
+cp ../helps/rcp.help/target/pdf/*.pdf ${UG_DIR}/
+cp -a ../helps/rcp.help/target/html/* ${UG_DIR}/apache_directory_studio/
+mkdir -p ${UG_DIR}/apacheds
+cp ../helps/apacheds.help/target/pdf/*.pdf ${UG_DIR}/
+cp -a ../helps/apacheds.help/target/html/* ${UG_DIR}/apacheds
+mkdir -p ${UG_DIR}/ldap_browser
+cp ../helps/ldapbrowser.help/target/pdf/*.pdf ${UG_DIR}/
+cp -a ../helps/ldapbrowser.help/target/html/* ${UG_DIR}/ldap_browser
+mkdir -p ${UG_DIR}/ldif_editor
+cp ../helps/ldifeditor.help/target/pdf/*.pdf ${UG_DIR}/
+cp -a ../helps/ldifeditor.help/target/html/* ${UG_DIR}/ldif_editor
+mkdir -p ${UG_DIR}/schema_editor
+cp ../helps/schemaeditor.help/target/pdf/*.pdf ${UG_DIR}/
+cp -a ../helps/schemaeditor.help/target/html/* ${UG_DIR}/schema_editor
+
+
+echo
echo "### Success"