aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2017-04-18 22:56:53 +0200
committerChristian Weiske <cweiske@cweiske.de>2017-04-18 22:56:53 +0200
commit81019df2b6d03e732b00e66913546af75bc4d560 (patch)
tree72d35bfeb821f8f17645d5f864c8bae6f3c8231e
parent8b86653c2471e04429ae9fec19dc33fcb5e5c059 (diff)
downloadphorkie-81019df2b6d03e732b00e66913546af75bc4d560.tar.gz
phorkie-81019df2b6d03e732b00e66913546af75bc4d560.zip
Move off sourceforge
-rw-r--r--README.rst28
-rw-r--r--build.properties.dist1
-rw-r--r--build.xml41
-rw-r--r--composer.json2
-rw-r--r--data/templates/base.htm2
-rw-r--r--src/stub-phar.php2
-rw-r--r--www/setup.php2
7 files changed, 29 insertions, 49 deletions
diff --git a/README.rst b/README.rst
index 422306c..391db6b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,13 @@
-************************************
-phorkie - PHP and Git based pastebin
-************************************
+****************************
+phorkie - Git based pastebin
+****************************
Self-hosted pastebin software written in PHP.
Pastes are editable, may have multiple files and are stored in git repositories.
-Project page: http://sourceforge.net/p/phorkie/
+`Homepage <https://cweiske.de/phorkie.htm>`__
+| `Bug tracker <https://github.com/cweiske/phorkie/issues>`__
+| `Git repository <https://git.cweiske.de/phorkie.git>`__
+ยท `GitHub mirror <https://github.com/cweiske/phorkie/>`__
.. contents:: Table of Contents
@@ -45,6 +48,18 @@ Features
- text file detection for unknown file types
+========
+Download
+========
+phorkie is released as self-contained ``.phar`` file that includes
+all dependencies, as well as a normal zip file.
+
+.. LATESTRELEASE
+
+See `phorkie downloads page <http://cweiske.de/phorkie-download.htm>`_
+for all released versions.
+
+
============
Installation
============
@@ -462,6 +477,7 @@ Releasing a new version
$ phing phar
#. Test.
#. Tag the release in git
-#. Upload release to sourceforge::
+#. Run the script to update the homepage
- $ phing deploy-sf
+ $ cd /home/cweiske/Dev/html/cweiske.de
+ $ ./scripts/update-phorkie.sh
diff --git a/build.properties.dist b/build.properties.dist
deleted file mode 100644
index b50ad08..0000000
--- a/build.properties.dist
+++ /dev/null
@@ -1 +0,0 @@
-sfuser=FIXME
diff --git a/build.xml b/build.xml
index 6556277..8237c65 100644
--- a/build.xml
+++ b/build.xml
@@ -6,9 +6,6 @@
tasks around phorkie, like creating a release version,
tagging a release
-->
- <property file="build.properties" />
-
- <property name="version-m" value="0.7" />
<property name="version" value="0.7.0" />
<property name="stability" value="beta" />
<property name="releasenotes" value="
@@ -27,9 +24,6 @@ Version 0.7.0 - 2015-11-05
<property name="distfile" value="dist/${zipfile}" />
<property name="distpkgfile" value="dist/pear/${pkgfile}" />
- <property name="sfproject" value="phorkie" />
- <property name="sffilepath" value="p/ph/phorkie/" />
-
<fileset id="fs.zip" dir=".">
<include name="data/**"/>
<include name="scripts/**"/>
@@ -306,7 +300,7 @@ Version 0.7.0 - 2015-11-05
</target>
- <target name="build-docs" description="render documentation">
+ <target name="docs" description="render documentation">
<rST format="html" uptodate="true">
<fileset refid="fs.doc"/>
<mapper type="regexp" from="^(.+?).rst$" to="dist/docs/\1.html"/>
@@ -318,39 +312,13 @@ Version 0.7.0 - 2015-11-05
</target>
- <target name="release" depends="check,zip,pear,deploy-sf"
- description="Release the version on sourceforge"
+ <target name="release" depends="check,zip,pear"
+ description="Package the new version"
>
<!-- meta-target -->
</target>
- <!--
- /home/frs/project/p/ph/phorkie/phorkie/v0.1/
- /home/frs/project/p/ph/phorkie/phorkie/v0.1/phorkie-v0.1.0.zip
- /home/frs/project/p/ph/phorkie/phorkie/v0.1/phorkie-v0.1.1.zip
- https://sourceforge.net/apps/trac/sourceforge/wiki/Release%20files%20for%20download
- -->
- <target name="deploy-sf" depends="check,zip,phar"
- description="Upload release to sourceforge"
- >
- <delete dir="dist/deploy-sf" /><!-- make empty -->
- <mkdir dir="dist/deploy-sf" />
- <mkdir dir="dist/deploy-sf/v${version-m}" />
- <copy file="${distfile}" tofile="dist/deploy-sf/v${version-m}/${zipfile}"/>
- <copy file="${pharpath}" tofile="dist/deploy-sf/v${version-m}/${pharfile}"/>
- <!-- test
- <exec command="rsync -av dist/deploy-sf/ /tmp/test/" escape="false" />
- -->
- <exec
- command="rsync -av -e ssh dist/deploy-sf/ ${sfuser},${sfproject}@frs.sourceforge.net:/home/frs/project/${sffilepath}/${sfproject}/"
- escape="false" checkreturn="false"
- />
- <!-- rsync always returns code 23 on sourceforge releases, so we
- can't check return values -->
- </target>
-
-
<target name="preparedirs">
<mkdir dir="dist" />
</target>
@@ -359,9 +327,6 @@ Version 0.7.0 - 2015-11-05
description="Check variables"
>
<fail unless="version" message="Version not defined!" />
- <fail unless="sfuser" message="Sourceforge username not defined!" />
- <fail unless="sfproject" message="Sourceforge project name not defined!" />
- <fail unless="sffilepath" message="Sourceforge project file path not defined!" />
</target>
</project>
diff --git a/composer.json b/composer.json
index caf409d..8e91f29 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "cweiske/phorkie",
"type": "project",
"license": "AGPL-3.0+",
- "homepage": "http://sourceforge.net/p/phorkie/",
+ "homepage": "https://cweiske.de/phorkie.htm",
"authors": [
{
"name": "Christian Weiske",
diff --git a/data/templates/base.htm b/data/templates/base.htm
index 8f09ffb..7eef70f 100644
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -92,7 +92,7 @@
</div>
<div class="container footer">
- <a href="//sf.net/p/phorkie/">phorkie</a>,
+ <a href="https://cweiske.de/phorkie.htm">phorkie</a>,
the self-hosted, git-based pastebin software is available under the
<a href="http://www.gnu.org/licenses/agpl-3.0.html">
<abbr title="GNU Affero General Public License">AGPL</abbr></a>.
diff --git a/src/stub-phar.php b/src/stub-phar.php
index 95e894c..859152b 100644
--- a/src/stub-phar.php
+++ b/src/stub-phar.php
@@ -9,7 +9,7 @@
* @author Christian Weiske <cweiske@cweiske.de>
* @copyright 2014 Christian Weiske
* @license http://www.gnu.org/licenses/agpl.html GNU AGPL v3
- * @link http://phorkie.sf.net/
+ * @link https://cweiske.de/phorkie.htm
*/
if (!in_array('phar', stream_get_wrappers()) || !class_exists('Phar', false)) {
echo "Phar extension not avaiable\n";
diff --git a/www/setup.php b/www/setup.php
index 2656c9c..909306f 100644
--- a/www/setup.php
+++ b/www/setup.php
@@ -133,7 +133,7 @@ $out .= <<<HTM
</div>
<div class="container footer">
- <a href="//sf.net/p/phorkie/">phorkie</a>,
+ <a href="https://cweiske.de/phorkie.htm">phorkie</a>,
the self-hosted, git-based pastebin software is available under the
<a href="http://www.gnu.org/licenses/agpl-3.0.html">
<abbr title="GNU Affero General Public License">AGPL</abbr></a>.