r35538 - in /packages/z88/trunk/debian: CMakeLists.txt get-orig-source patches/50_all_changes.dpatch rules
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Mon Feb 23 19:44:06 UTC 2009
Author: domibel-guest
Date: Mon Feb 23 19:44:06 2009
New Revision: 35538
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35538
Log:
uses cmake now
Added:
packages/z88/trunk/debian/CMakeLists.txt
Modified:
packages/z88/trunk/debian/get-orig-source
packages/z88/trunk/debian/patches/50_all_changes.dpatch
packages/z88/trunk/debian/rules
Added: packages/z88/trunk/debian/CMakeLists.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/CMakeLists.txt?rev=35538&op=file
==============================================================================
--- packages/z88/trunk/debian/CMakeLists.txt (added)
+++ packages/z88/trunk/debian/CMakeLists.txt Mon Feb 23 19:44:06 2009
@@ -1,0 +1,66 @@
+# The name of our project is "Z88". CMakeLists files in this project can
+# refer to the root source directory of the project as ${Z88_SOURCE_DIR} and
+# to the root binary directory of the project as ${Z88_BINARY_DIR}.
+cmake_minimum_required (VERSION 2.6)
+project (Z88)
+
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFR_UNIX -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer")
+
+# Recurse into the "Hello" and "Demo" subdirectories. This does not actually
+# cause another cmake executable to run. The same process will walk through
+# the project's entire directory structure.
+#add_subdirectory (Hello)
+#add_subdirectory (Demo)
+
+# Make sure the compiler can find include files from our library.
+include_directories (${Z88_SOURCE_DIR})
+
+# Make sure the linker can find the library once it is built.
+link_directories (${Z88_BINARY_DIR})
+
+add_executable (z88f z88f.c ale88f dyn88f clr88 choy88 m1 m2 stop88f cshe88 hexa88 lqua88 qshe88 isod88 tetr88 spur88 apla88 spla88 hpla88 ri188 who88f wlog88f prfl88 bhexa88 btetr88 bqshe88 bspla88 bspur88 blqua88 bcshe88 bapla88 bhpla88 ri588 wrim88f wria88f lan88f z88a z88b z88cc)
+target_link_libraries (z88f m)
+
+add_executable (z88i1 z88i1.c ale88i dyn88i1 clr88 w4y88i stop88i ri188i who88i1 wlog88i1 wrim88i wria88i lan88i1 z88ai)
+target_link_libraries (z88i1 m)
+
+add_executable (z88i2 z88i2.c ale88i dyn88i2 clr88 jaco88 m1 m2 stop88i cshe88 hexa88 lqua88 qshe88 isod88 tetr88 spur88 apla88 spla88 hpla88 r4y88i r1y88i who88i2 wlog88i2 prfl88 wrim88i lan88i2 z88bi z88ci ri588i bhexa88 btetr88 bqshe88 bspla88 bspur88 blqua88 bcshe88 bapla88 bhpla88)
+target_link_libraries (z88i2 m)
+
+add_executable (z88e z88e.c ale88e dyn88e clr88 m1 m2 stop88e cshe88 hexa88 lqua88 qshe88 isod88 tetr88 spur88 spla88 hpla88 apla88 riy88 forc88 who88e wlog88e wrim88e lan88e)
+target_link_libraries (z88e m)
+
+add_executable (z88d z88d.c ale88d dyn88d clr88 m3 m4 fuvs88 stop88d scsh88 shex88 slqu88 sqsh88 siso88 stet88 sspu88 sapl88 sspl88 shpl88 riy88d span88 who88d wlog88d wrim88d lan88d)
+target_link_libraries (z88d m)
+
+add_executable (z88n z88n.c ale88n dyn88n clr88 join88 subn88 stop88n mc188n mc288n mc388n mc488n mc588n rni88 who88n wlog88n wrim88n lan88n)
+target_link_libraries (z88n m)
+
+add_executable (z88v z88v.c ale88v dyn88v clr88 stop88v fr_func vend88 g1i188 g2i188 g3i188 g4i188 g5i188 gxi288 g1i388 g1i488 gxi588 lan88v wlog88v who88v)
+target_link_libraries (z88v m)
+
+add_executable (z88x z88x.c ale88x dyn88x clr88 koi88x rea88x stop88x sub88x who88x wlog88x wria88x wrim88x z88fx z88tx lan88x)
+target_link_libraries (z88x m)
+
+add_executable (z88g z88g.c ale88g clr88 stop88g cosm88 nast88 dnas88 who88g wlog88g wrim88g lan88g)
+target_link_libraries (z88g m)
+
+add_executable (z88h z88h.c ale88h clr88 stop88h who88h wlog88h wrim88h lan88h rdy88h)
+target_link_libraries (z88h m)
+
+add_executable (z88p z88p.c cb88p lan88p dyn88p wlog88p ale88p rcol88 m5 m6 m7 m8 pc88 pp88 pgpc88 pgpp88 vc88 vp88 vgpc88 vgpp88)
+target_link_libraries (z88p Xm Xt m)
+
+add_executable (z88o z88o.c cb88o lan88o dyn88o wlog88o ale88o rcoo88 m9 m10 m12 m14 m15 oc88)
+target_link_libraries (z88o GLw GL Xm Xt m)
+
+add_executable (z88com z88com.c cb88c lan88c wlog88c ale88c rcol88c)
+target_link_libraries (z88com Xm)
+
+add_executable (laserj88 laserj88.c)
+add_executable (pxon88 pxon88.c)
+
+
+install(TARGETS laserj88 pxon88 z88com z88d z88e z88f z88g z88h z88i1 z88i2 z88n z88o z88p z88v z88x
+ RUNTIME DESTINATION bin
+ )
Modified: packages/z88/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/get-orig-source?rev=35538&op=diff
==============================================================================
--- packages/z88/trunk/debian/get-orig-source (original)
+++ packages/z88/trunk/debian/get-orig-source Mon Feb 23 19:44:06 2009
@@ -9,19 +9,19 @@
mv *.htm html
mv *.gif html
mv *.jpg html
-#mkdir src
-#mv *.c src/
-#mv *.h src/
-#mv *.mk.* src/
-#mv COMPILE* src/
-#mv *fcd* src/
-#mkdir data
-#mv b* data/
-#mv z88x.dxf data/
-#mv z88*txt data/
+rm -f *mk*
+rm -f COM*
+mkdir src
+mv *.c src/
+mv *.h src/
+rm z88.fcd.*
+mkdir data
+mv b* data/
+mv z88x.dxf data/
+mv z88*txt data/
cd ..
echo "Creating orig tarball."
tar -czf z88_12.0.1.orig.tar.gz z88-12.0.1/
echo "Removing extracted directory."
-rm -rf z88-12.0.1
-rm z88src.tgz
+#rm -rf z88-12.0.1
+#rm z88src.tgz
Modified: packages/z88/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/patches/50_all_changes.dpatch?rev=35538&op=diff
==============================================================================
--- packages/z88/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/z88/trunk/debian/patches/50_all_changes.dpatch Mon Feb 23 19:44:06 2009
@@ -2,12 +2,12 @@
## 50_all_changes.dpatch by <domibel at sid1500>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: removes additional files for the "make clean target"
+## DP: corrects some documentation paths
@DPATCH@
diff -urNad z88-12.0.1~/z88 z88-12.0.1/z88
--- z88-12.0.1~/z88 2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1/z88 2009-02-16 12:51:33.000000000 -0500
++++ z88-12.0.1/z88 2009-02-23 14:17:55.000000000 -0500
@@ -45,8 +45,8 @@
echo "For further information consult"
@@ -21,9 +21,9 @@
-z88com
\ No newline at end of file
+z88com
-diff -urNad z88-12.0.1~/z88.fcd.linux z88-12.0.1/z88.fcd.linux
---- z88-12.0.1~/z88.fcd.linux 2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1/z88.fcd.linux 2009-02-16 12:51:33.000000000 -0500
+diff -urNad z88-12.0.1~/z88.fcd z88-12.0.1/z88.fcd
+--- z88-12.0.1~/z88.fcd 2006-03-23 06:00:00.000000000 -0500
++++ z88-12.0.1/z88.fcd 2009-02-23 14:17:32.000000000 -0500
@@ -26,7 +26,7 @@
Your HTML-or Internet Browser's prefix
@@ -33,45 +33,3 @@
Volume of alert bell
Warnton-Staerke
-diff -urNad z88-12.0.1~/z88.mk.kernel.linux32 z88-12.0.1/z88.mk.kernel.linux32
---- z88-12.0.1~/z88.mk.kernel.linux32 2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1/z88.mk.kernel.linux32 2009-02-16 12:51:33.000000000 -0500
-@@ -13,7 +13,7 @@
- #############################################################################
-
- CC = gcc
--CFLAGS = -march=i586 -I. -DFR_UNIX -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer
-+CFLAGS = -I. -DFR_UNIX -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer
-
- LDLIBSOX = -lm -lc
-
-@@ -49,6 +49,7 @@
-
- clean:
- rm -f *.o
-+ rm -r z88f z88i1 z88i2 z88e z88d
-
- z88f: $(OBJECTSF)
- $(CC) -o $@ $(OBJECTSF) $(LDLIBSOX)
-diff -urNad z88-12.0.1~/z88.mk.other.linux32 z88-12.0.1/z88.mk.other.linux32
---- z88-12.0.1~/z88.mk.other.linux32 2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1/z88.mk.other.linux32 2009-02-16 12:51:56.000000000 -0500
-@@ -7,7 +7,7 @@
- # 23.3.2006 Rieg
- #############################################################################
- CC = gcc
--CFLAGS = -march=i586 -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer
-+CFLAGS = -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer
-
- LDLIBSOM = -lc
- LDLIBSOX = -lm -lc
-@@ -60,8 +60,8 @@
- rm -f *.o
- rm -f *.log
- rm -f *.bny
-- rm -f z*.txt
- rm -f z88p.sto
-+ rm -f z88n z88v z88x z88g z88h z88p z88o z88com laserj88 pxon88
-
- ready:
- cp b1_x.dxf z88x.dxf
Modified: packages/z88/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/rules?rev=35538&op=diff
==============================================================================
--- packages/z88/trunk/debian/rules (original)
+++ packages/z88/trunk/debian/rules Mon Feb 23 19:44:06 2009
@@ -10,14 +10,31 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
get-orig-source:
. debian/get-orig-source
+BUILD_PATH = DEB_build
+
+CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_SKIP_RPATH:BOOL=ON \
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
# Add here commands to configure the package.
+
+ cp debian/CMakeLists.txt src/
+ if [ ! -d $(BUILD_PATH) ]; then mkdir $(BUILD_PATH); fi
+ cd $(BUILD_PATH) \
+ && cmake $(CURDIR)/src/ $(CMAKE_FLAGS)
touch $@
@@ -28,14 +45,7 @@
dh_testdir
# Add here commands to compile the package.
- # $(MAKE)
-
- # COMPILE.LINUX32
- cp z88.fcd.linux z88.fcd
- make -f z88.mk.kernel.linux32 kernel
- make -f z88.mk.other.linux32 other ready
-
- #docbook-to-man debian/z88.sgml > z88.1
+ $(MAKE) $(JOBS) -C $(BUILD_PATH)
touch $@
@@ -46,13 +56,9 @@
dh_testroot
rm -f build-stamp configure-stamp
+ rm -f src/CMakeLists.txt
# Add here commands to clean up after the build process.
-
- # $(MAKE) clean
- - rm -f z88.fcd
- - rm -f *.o
- - rm -f z88n z88v z88x z88g z88h z88p z88o z88com laserj88 pxon88
- - rm -f z88f z88i1 z88i2 z88e z88d
+ rm -rf $(BUILD_PATH)
dh_clean
@@ -62,12 +68,12 @@
dh_prep
dh_installdirs
- # Add here commands to install the package into debian/z88.
-# $(MAKE) DESTDIR=$(CURDIR)/debian/z88 install
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) $(JOBS) -C $(BUILD_PATH) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -pz88 z88 laserj88 pxon88 z88com z88d z88e z88f z88g z88h z88i1 z88i2 z88n z88o z88p z88v z88x usr/bin
+ dh_install -pz88 debian/tmp/usr/bin/* z88 usr/bin
dh_install -pz88 z88.fcd z88.dyn LIESMICH README usr/share/z88
- dh_install -pz88-data b*.txt z*.txt *.dxf *.nas *.cos usr/share/z88
+ dh_install -pz88-data data/* usr/share/z88
dh_install -pz88 debian/z88.desktop usr/share/applications
More information about the debian-science-commits
mailing list