Skip to content

Commit

Permalink
Make install for macOS, icons folder, icns files, updates in INSTALL,…
Browse files Browse the repository at this point in the history
… README and LISEZMOI"
  • Loading branch information
hgouraud authored and fablhx committed Jul 25, 2016
1 parent e9954f6 commit b224f63
Show file tree
Hide file tree
Showing 16 changed files with 168 additions and 49 deletions.
10 changes: 8 additions & 2 deletions INSTALL
Expand Up @@ -28,10 +28,16 @@ They freely distributed at address:

4- To use GeneWeb, move the directory "distribution" to another place, or
rename it.
On macOSX, do:
make install
This will install the distribution folder on your Desktop and rename it "GeneWeb-7.00-Mac"
(or another name of your choice).

Go to this directory and launch the command "./gwsetup".
Go to this directory and launch the commands "./gwd" and possibly "./gwsetup".
On macOSX, geneweb.command will kill previous instances, launch both gwd and gwsetup
and minimize the window.

The reason why it is better to move this directory is that "make clean"
The reason why it is much better to move this directory is that "make clean"
deletes it, and another "make distrib" overwrites it. If you created
genealogic databases inside, they would be deleted.

Expand Down
44 changes: 28 additions & 16 deletions Makefile
Expand Up @@ -31,21 +31,28 @@ $(DEPEND_DEPEND):
.PHONY: install uninstall distrib

install:
mkdir -p $(PREFIX)/bin
cp src/gwc1 $(PREFIX)/bin/gwc$(EXE)
cp src/gwc1 $(PREFIX)/bin/gwc1$(EXE)
cp src/gwc2 $(PREFIX)/bin/gwc2$(EXE)
cp src/consang $(PREFIX)/bin/consang$(EXE)
cp src/gwd $(PREFIX)/bin/gwd$(EXE)
cp src/gwu $(PREFIX)/bin/gwu$(EXE)
cp ged2gwb/ged2gwb $(PREFIX)/bin/ged2gwb$(EXE)
cp ged2gwb/ged2gwb2 $(PREFIX)/bin/ged2gwb2$(EXE)
cp gwb2ged/gwb2ged $(PREFIX)/bin/gwb2ged$(EXE)
cp setup/setup $(PREFIX)/bin/gwsetup$(EXE)
cp src/update_nldb $(PREFIX)/bin/update_nldb$(EXE)
cp -R hd/* $(LANGDIR)/.
mkdir -p $(MANDIR)
cd man; cp $(MANPAGES) $(MANDIR)/.
PWD=`pwd`
if test "$(OS_TYPE)" = "Darwin"; then \
etc/macOS/install.command $(PWD) $(DESTDIR) etc/macOS; \
elif test "$(OS_TYPE)" = "Win"; then \
echo "No install for Window" \
else \
mkdir -p $(PREFIX)/bin; \
cp src/gwc1 $(PREFIX)/bin/gwc$(EXE); \
cp src/gwc1 $(PREFIX)/bin/gwc1$(EXE); \
cp src/gwc2 $(PREFIX)/bin/gwc2$(EXE); \
cp src/consang $(PREFIX)/bin/consang$(EXE); \
cp src/gwd $(PREFIX)/bin/gwd$(EXE); \
cp src/gwu $(PREFIX)/bin/gwu$(EXE); \
cp ged2gwb/ged2gwb $(PREFIX)/bin/ged2gwb$(EXE); \
cp ged2gwb/ged2gwb2 $(PREFIX)/bin/ged2gwb2$(EXE); \
cp gwb2ged/gwb2ged $(PREFIX)/bin/gwb2ged$(EXE); \
cp setup/setup $(PREFIX)/bin/gwsetup$(EXE); \
cp src/update_nldb $(PREFIX)/bin/update_nldb$(EXE); \
cp -R hd/* $(LANGDIR)/.; \
mkdir -p $(MANDIR); \
cd man; cp $(MANPAGES) $(MANDIR)/.; \
fi

uninstall:
$(RM) $(PREFIX)/bin/gwc$(EXE)
Expand All @@ -61,20 +68,25 @@ uninstall:
$(RM) -r $(PREFIX)/share/geneweb
cd $(MANDIR); $(RM) $(MANPAGES)

distribution: distrib
distrib:
$(RM) -r $(DESTDIR)
mkdir $(DESTDIR)
mkdir -p $(DESTDIR)/bases
cp CHANGES $(DESTDIR)/CHANGES.txt
cp LICENSE $(DESTDIR)/LICENSE.txt
cp etc/README.txt $(DESTDIR)/.
cp etc/LISEZMOI.txt $(DESTDIR)/.
cp etc/START.htm $(DESTDIR)/.
if test $(OS_TYPE) = "Win"; then \
cp etc/Windows/gwd.bat $(DESTDIR); \
cp etc/Windows/gwsetup.bat $(DESTDIR); \
cp -f etc/Windows/README.txt $(DESTDIR)/README.txt; \
cp -f etc/Windows/LISEZMOI.txt $(DESTDIR)/LISEZMOI.txt; \
elif test $(OS_TYPE) = "Darwin"; then \
cp etc/macOS/geneweb.command $(DESTDIR); \
cp etc/gwd $(DESTDIR)/gwd.command; \
cp etc/gwsetup $(DESTDIR)/gwsetup.command; \
cp etc/macOS/geneweb.command $(DESTDIR); \
else \
cp etc/gwd $(DESTDIR); \
cp etc/gwsetup $(DESTDIR); \
Expand Down
33 changes: 16 additions & 17 deletions etc/LISEZMOI.txt
@@ -1,31 +1,30 @@
GeneWeb 5.01
GeneWeb 7.00

Pour demarrer avec GeneWeb, suivez les instructions suivantes:
Ouvrez la page START.htm

Si vous etes sous Windows:
Double-cliquez sur le fichier "index.htm" du repertoire "doc",
et suivez les instructions.

Si vous etes sous Unix ou Mac:
Lancez votre navigateur Web.
Si vous avez installe GeneWeb, par exemple dans
/home/dupont/geneweb
ouvrez la location:
file:/home/dupont/geneweb/gw/doc/index.htm
et suivez les instructions.
Si vous avez l'intention d'ouvrir une base, vous devez avoir d�marr� le programme gwd
en double cliquant sur l'icone gwd.bat (Windows), gwd.command (macOS) or gwd (Linux).
Si vous avez l'intention de g�rer ou cr�er une base, vous devez avoir d�marr� le programme gwsetup
en double cliquant sur l'icone gwsetup.bat (Windows), gwsetup.command (macOS) or gwsetup (Linux).

Sur macOS, geneweb.command tue les versions pr�c�dentes, ouvre les deux programmes et
minimise la fen�tre correspondante.

-----------------

Voir le fichier CHANGES (en anglais) dans ce repertoire-ci pour les
changements par rapport aux versions precedentes.

-----------------

GeneWeb est Copyright (c) 1998-2007 INRIA.
GeneWeb est Copyright (c) 1998-2016 INRIA.
Cr�ateur d'origine Daniel de Rauglaudre

Remarques, suggestions, questions, rapports d'anomalie a:
daniel.de_rauglaudre@inria.fr
http://pauillac.inria.fr/~ddr/
Remarques, suggestions, questions, rapports d'erreur sur:
https://github.com/geneweb/geneweb/issues
or
https://groups.yahoo.com/neo/groups/GeneWeb/info

Veuillez preciser le numero de version ci-dessus et le systeme sur lequel
vous tournez (Unix, Windows, Mac).

28 changes: 14 additions & 14 deletions etc/README.txt
@@ -1,29 +1,29 @@
GeneWeb 5.01
GeneWeb 7.00

If you are under Windows:
Double-click on the file "index.htm" of the directory "doc",
and follow the instructions.
Open the START.htm page

If you are under Unix or Mac
Launch your Web navigator.
If you installed GeneWeb, for example in
/home/smith/geneweb
open the location:
file:/home/smith/geneweb/gw/doc/index.htm
and follow the instructions.
If you intend to open a base, you must have started the gwd program
by double clicking on the gwd.bat (Windows), gwd.command (macOS) or gwd (Linux) icon.
If you intend to manage or create a base, you must have started the gwsetup program
by double clicking on the gwsetup.bat (Windows), gwsetup.command (macOS) or gwsetup (Linux) icon.

On macOS geneweb.command will kill previous versions, start both programs and minimises
the corresponding window.

-----------------

See the file CHANGES in the present directory for the changes since
the previous versions.

-----------------

GeneWeb is Copyright (c) 1998-2007 INRIA.
GeneWeb is Copyright (c) 1998-2016 INRIA.
Original creator Daniel de Rauglaudre

Remarks, suggestions, questions, bug reports to:
daniel.de_rauglaudre@inria.fr
http://pauillac.inria.fr/~ddr/
https://github.com/geneweb/geneweb/issues
or
https://groups.yahoo.com/neo/groups/GeneWeb/info

Please specify the version number above and the system you use (Unix,
Windows, Mac)
27 changes: 27 additions & 0 deletions etc/START.htm
Expand Up @@ -85,6 +85,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">Bedienungsanleitung</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">Lizenz</a> /
</div>
Expand All @@ -99,6 +102,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">User Guide</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">License</a> /
</div>
Expand All @@ -113,6 +119,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">Modo de empleo</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">Licencia</a> /
</div>
Expand All @@ -127,6 +136,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">Mode d'emploi</a></li>
</ul>
<ul class="doc">
<li><a href="LISEZMOI.txt" target="_blank">LISEZMOI.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">Licence</a> /
</div>
Expand All @@ -141,6 +153,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">Istruzioni per l'uso</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">Licenza</a> /
</div>
Expand All @@ -155,6 +170,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">User Guide</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">License</a> /
</div>
Expand All @@ -169,6 +187,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">User Guide</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">License</a> /
</div>
Expand All @@ -183,6 +204,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">User Guide</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">License</a> /
</div>
Expand All @@ -197,6 +221,9 @@
<ul class="doc">
<li><a href="http://geneweb.tuxfamily.org/wiki/GeneWeb" target="_blank">User Guide</a></li>
</ul>
<ul class="doc">
<li><a href="README.txt" target="_blank">README.txt</a></li>
</ul>
<div class="bottom">
<a href="https://github.com/geneweb/geneweb/blob/master/LICENSE" target="_blank">License</a> /
</div>
Expand Down
2 changes: 2 additions & 0 deletions etc/macOS/geneweb.command
Expand Up @@ -79,4 +79,6 @@ fi

open "$DIR/START.htm"

/usr/bin/osascript -e 'tell application "Terminal" to set miniaturized of first window whose name contains "GeneWeb" to true'

cat
Binary file added etc/macOS/icons/gw-folder.icns
Binary file not shown.
Binary file added etc/macOS/icons/gw-folder.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added etc/macOS/icons/gw.icns
Binary file not shown.
Binary file added etc/macOS/icons/gw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added etc/macOS/icons/gwd.icns
Binary file not shown.
Binary file added etc/macOS/icons/gwd.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added etc/macOS/icons/gwsetup.icns
Binary file not shown.
Binary file added etc/macOS/icons/gwsetup.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions etc/macOS/install.command
@@ -0,0 +1,38 @@
#!/bin/bash

# Installation script

PWD=$1
DISTRIB=$2
RESOURCES=$3
TARGET=~/Desktop
read -p "Where do you want to install? $HOME/Desktop/[GeneWeb-7.00-Mac]:" mot

if [ "$mot" = "" ] ; then
TARGET=$HOME/Desktop/GeneWeb-7.00-Mac
else
TARGET=$HOME/Desktop/$mot
fi
pwd
echo "Installing GeneWeb in $TARGET"

rm -f -R $TARGET
mkdir -p $TARGET
mkdir -p $TARGET/bases

cp $PWD/$DISTRIB/CHANGES.txt $TARGET
cp $PWD/$DISTRIB/LICENSE.txt $TARGET
cp $PWD/$DISTRIB/README.txt $TARGET
cp $PWD/$DISTRIB/LISEZMOI.txt $TARGET
cp $PWD/$DISTRIB/START.htm $TARGET
cp $PWD/$DISTRIB/geneweb.command $TARGET
cp $PWD/$DISTRIB/gwd.command $TARGET
cp $PWD/$DISTRIB/gwsetup.command $TARGET
cp -R $PWD/$DISTRIB/gw $TARGET

$PWD/$RESOURCES/seticon.sh $PWD/$RESOURCES/icons/gw-folder.icns $TARGET > /dev/null
$PWD/$RESOURCES/seticon.sh $PWD/$RESOURCES/icons/gw.icns $TARGET/geneweb.command > /dev/null
$PWD/$RESOURCES/seticon.sh $PWD/$RESOURCES/icons/gwd.icns $TARGET/gwd.command > /dev/null
$PWD/$RESOURCES/seticon.sh $PWD/$RESOURCES/icons/gwsetup.icns $TARGET/gwsetup.command > /dev/null

echo "Done install"
35 changes: 35 additions & 0 deletions etc/macOS/seticon.sh
@@ -0,0 +1,35 @@
#!/bin/sh
# Sets an icon on file or directory
# Usage setIcon.sh iconimage.jpg /path/to/[file|folder]
iconSource=$1
iconDestination=$2
icon=/tmp/`basename $iconSource`
rsrc=/tmp/icon.rsrc

# Create icon from the iconSource
cp $iconSource $icon

# Add icon to image file, meaning use itself as the icon
sips -i $icon

# Take that icon and put it into a rsrc file
DeRez -only icns $icon > $rsrc

# Apply the rsrc file to
SetFile -a C $iconDestination

if [ -f $iconDestination ]; then
# Destination is a file
Rez -append $rsrc -o $iconDestination
elif [ -d $iconDestination ]; then
# Destination is a directory
# Create the magical Icon\r file
touch $iconDestination/$'Icon\r'
Rez -append $rsrc -o $iconDestination/Icon?
SetFile -a V $iconDestination/Icon?
fi

# Sometimes Finder needs to be reactivated
#osascript -e 'tell application "Finder" to quit'
#osascript -e 'delay 2'
#osascript -e 'tell application "Finder" to activate'

0 comments on commit b224f63

Please sign in to comment.