FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 17:26:34 +00:00
Code Issues Releases Wiki Activity

Reorg - Part 6

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1867 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-09-18 14:11:49 +00:00
parent 3eac189f69
commit f4fe315b1d
2 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/Makefile
View File

@ -4,13 +4,6 @@ VARDIR=/var/log/fhem
MANDIR=/usr/share/man/man1 MANDIR=/usr/share/man/man1
ETCDIR=/etc ETCDIR=/etc
BINDIR=/tmp/fhem/usr/bin
MODDIR=/tmp/fhem/usr/share/fhem
VARDIR=/tmp/fhem/var/log/fhem
MANDIR=/tmp/fhem/usr/share/man/man1
ETCDIR=/tmp/fhem/etc
# Used for .deb package creation # Used for .deb package creation
RBINDIR=$(ROOT)$(BINDIR) RBINDIR=$(ROOT)$(BINDIR)
RMODDIR=$(ROOT)$(MODDIR) RMODDIR=$(ROOT)$(MODDIR)
@ -83,8 +76,9 @@ uninstall:backup
dist: dist:
mkdir .f mkdir .f
cp -r CHANGED FHEM HISTORY Makefile README.SVN\ cp -r fhem.pl fhem.cfg CHANGED HISTORY Makefile README.SVN\
contrib docs examples fhem.pl webfrontend .f FHEM contrib docs www webfrontend .f
mkdir .f/log
find .f -name .svn -print | xargs rm -rf find .f -name .svn -print | xargs rm -rf
find .f -name \*.orig -print | xargs rm -f find .f -name \*.orig -print | xargs rm -f
find .f -name .#\* -print | xargs rm -f find .f -name .#\* -print | xargs rm -f
@ -120,7 +114,7 @@ deb:
rm -rf $(DESTDIR) rm -rf $(DESTDIR)
fb7390: fb7390:
cd contrib/FB7390 && ./makeimage $(DESTDIR) cd contrib/FB7390 && sh ./makeimage $(DESTDIR)
fb7270: fb7270:
cd contrib/FB7270 && ./makeimage $(DESTDIR) cd contrib/FB7270 && ./makeimage $(DESTDIR)

44
fhem/contrib/FB7390/makeimage
View File

@ -8,48 +8,30 @@ if test ! -f ../../$fw.tar.gz; then
fi fi
rm -rf var rm -rf var
echo Extracting the fritzbox template
tar xf ../../priv/fritzbox7390_template.tar tar xf ../../priv/fritzbox7390_template.tar
cd var cd var
tar zxf fhem.tar.gz tar zxf fhem.tar.gz
rm -rf fhem/FHEM rm -rf fhem/{FHEM,www,docs}
mkdir fhem/FHEM
cd .. cd ..
rm -rf $fw
tar zxf ../../$fw.tar.gz
cd $fw
cp -rp fhem.pl fhem.cfg FHEM docs www ../var/fhem
cd ..
rm -rf $fw
rm -rf var/fhem/docs/*.{odg,pdf,man,txt}
cp install var cp install var
cp startfhem var/fhem cp startfhem var/fhem
cp fhemcmd.sh var/fhem/FHEM cp fhemcmd.sh var/fhem/FHEM
cd var
echo Extracting $fw
rm -rf $fw
tar zxf ../../$fw.tar.gz
cd $fw
cp fhem.pl ../var/fhem
cp FHEM/*\
webfrontend/pgm2/*\
docs/*.html\
docs/fhem.png\
docs/*.jpg\
../var/fhem/FHEM
cd examples
for i in *; do
cp -r $i ../../var/fhem/FHEM/example.$i
done
cd ../..
rm -rf $fw
echo Packing again
cd var/fhem
cp FHEM/example.sample_pgm2 fhem.cfg
perl -pi -e 's,/tmp,./log,g' fhem.cfg
cd ..
tar zcf fhem.tar.gz fhem tar zcf fhem.tar.gz fhem
rm -rf fhem rm -rf fhem
cd .. cd ..
tar cf $fw-fb7390.image var tar cf $fw-fb7390.image var
rm -rf var rm -rf var