nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pkg-refactor'

Browse source 
Conflicts:
	pkg/ubuntu/dist
This commit is contained in:
Alec Leamas 2010-10-31 00:05:24 +02:00
commit f37b0f8f07
4 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkg/fedora/README.md
View file

@ -1,13 +1,12 @@
## Diaspora RPM tools ## Diaspora RPM tools
Creates diaspora source tarballs and RPM packages Create RPM packages
An alternative to the capistrano system, providing classic, binary RPM An alternative to the capistrano system, providing classic, binary RPM
packages for deployment on Fedora 13 and OS-independent source tarballs packages for deployment on Fedora.
aimed for packaging purposes.
#### Fedora RPM synopsis #### Synopsis
Prerequisites: Prerequisites:
@ -62,15 +61,15 @@ Typically, this is secondary sources. *make-dist.sh source*
applies all patches named *.patch in this directory after checking out applies all patches named *.patch in this directory after checking out
source from git. source from git.
The spec-files in dist/ are patched by *./make-dist.sh prepare* to reference The spec-files in dist/ are patched by *./prepare-rpm.sh to reference
correct versions of diaspora and diaspora-bundle. The diaspora-bundle correct versions of diaspora and diaspora-bundle. The diaspora-bundle
is only updated if Gemfile is updated, upgrading diaspora doesn't is only updated if Gemfile is updated, upgrading diaspora doesn't
always require a new diaspora-bundle. Editing spec files should be done always require a new diaspora-bundle. Editing spec files should be done
in this directory, changes in dist/ are lost when doing *./make-dist prepare*. in this directory, changes in dist/ are lost when doing *./prepare-rpm.sh *.
The topmost comment's version is patched to reflect the complete version The topmost comment's version is patched to reflect the complete version
of current specfile by *make-dist source*. Write the comment in this of current specfile . Write the comment in this directory, copy-paste
directory, copy-paste previous version nr. It will be updated. previous version nr. It will be updated.
This has been confirmed to start up and provide basic functionality both using This has been confirmed to start up and provide basic functionality both using
the thin webserver and apache passenger, on 32/64 bit systems and in the the thin webserver and apache passenger, on 32/64 bit systems and in the
@ -79,17 +78,6 @@ at [ftp://mumin.dnsalias.net/pub/leamas/diaspora/builds](ftp://mumin.dnsalias.ne
#### Implementation #### Implementation
'make-dist.sh source' script checks out latest version of diaspora into the
dist/diaspora directory. This content is, after some patches, the diaspora package.
'make-dir.sh bundle' makes a *bundle package* in the diaspora dir.
The resulting bundle is stored in vendor/bundle. This is, after some more
patches, the content of diaspora-bundle tarball. Target systems makes a
*bundle install --local* to use it.
Here is also support for running the diaspora websocket service as a system
service through /sbin/service and some install scripts.
Diaspora files are stored in /usr/share/diaspora, and owned by root. The Diaspora files are stored in /usr/share/diaspora, and owned by root. The
bundle, containing some C extensions, is architecture-dependent and lives bundle, containing some C extensions, is architecture-dependent and lives
in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in

2
pkg/source/make-dist.sh
View file

@ -146,12 +146,12 @@ function make_bundle()
mv vendor/cache ../$bundle_name/vendor mv vendor/cache ../$bundle_name/vendor
mv vendor/gems ../$bundle_name/vendor mv vendor/gems ../$bundle_name/vendor
mv git-repos ../$bundle_name mv git-repos ../$bundle_name
git checkout Gemfile
cd .. cd ..
tar czf $bundle_name.tar.gz $bundle_name tar czf $bundle_name.tar.gz $bundle_name
mv $bundle_name/vendor/cache diaspora/vendor/cache mv $bundle_name/vendor/cache diaspora/vendor/cache
cd .. cd ..
} }
git checkout Gemfile
echo echo
echo "Bundle: dist/$bundle_name.tar.gz" echo "Bundle: dist/$bundle_name.tar.gz"
} }

1
pkg/ubuntu/dist Symbolic link
View file

@ -0,0 +1 @@
../source/dist/

0
pkg/ubuntu/dist/.gitkeep vendored
View file