[Pkg-cli-libs-commits] [taoframework] 58/91: * Fixed the example directory installation.

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master
in repository taoframework.

commit 6da81ad6772c6a385917252160989516835fe88d
Author: Sam Hocevar <sam at zoy.org>
Date:   Fri Jul 31 23:45:21 2009 +0000

      * Fixed the example directory installation.
---
 debian/Makefile                       | 18 +++++++++---------
 debian/changelog                      |  3 ++-
 debian/rules                          | 25 +++++++++++++------------
 debian/taoframework-examples.examples |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 52c798f..52dfd43 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -8,9 +8,9 @@ DRAWING_LIBS = /r:System.Windows.Forms /r:System.Data /r:System.Drawing
 #  CgExamples (libCg is not in Debian)
 #  GlfwExamples (Glfw is Windows-only)
 #  NeHe (examples require Windows specific stuff)
-SUBDIRS = OdeExamples.Basic SdlExamples DevIlExamples.SimpleExample \
-	  LuaExamples.Functions LuaExamples.Simple OpenAlExamples \
-	  FFmpegExamples PhysFsExamples.Simple FreeGlutExamples.One \
+SUBDIRS = OdeExamples SdlExamples DevIlExamples \
+	  LuaFunctions LuaSimple OpenAlExamples \
+	  FFmpegExamples PhysFsExamples FreeGlutExamples \
 	  NateRobins Redbook GeWangExamples
 TARGETS = $(addsuffix /Example.exe, $(SUBDIRS))
 
@@ -19,7 +19,7 @@ all: $(TARGETS)
 clean:
 	rm -f $(TARGETS)
 
-ODE_DIR = OdeExamples.Basic
+ODE_DIR = OdeExamples
 ODE_SRC = Basic.cs
 $(ODE_DIR)/Example.exe: $(addprefix $(ODE_DIR)/, $(ODE_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-ode $(SYSTEM_LIBS)
@@ -30,17 +30,17 @@ SDL_SRC = GfxPrimitives.cs Program.cs Rectangles.cs SdlExamples.cs \
 $(SDL_DIR)/Example.exe: $(addprefix $(SDL_DIR)/, $(SDL_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-sdl $(SYSTEM_LIBS) $(DRAWING_LIBS)
 
-DEVIL_DIR = DevIlExamples.SimpleExample
+DEVIL_DIR = DevIlExamples
 DEVIL_SRC = SimpleExample.cs
 $(DEVIL_DIR)/Example.exe: $(addprefix $(DEVIL_DIR)/, $(DEVIL_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-devil $(SYSTEM_LIBS)
 
-LUA1_DIR = LuaExamples.Functions
+LUA1_DIR = LuaFunctions
 LUA1_SRC = Functions.cs
 $(LUA1_DIR)/Example.exe: $(addprefix $(LUA1_DIR)/, $(LUA1_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-lua $(SYSTEM_LIBS)
 
-LUA2_DIR = LuaExamples.Simple
+LUA2_DIR = LuaSimple
 LUA2_SRC = Simple.cs
 $(LUA2_DIR)/Example.exe: $(addprefix $(LUA2_DIR)/, $(LUA2_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-lua $(SYSTEM_LIBS)
@@ -57,12 +57,12 @@ FFMPEG_SRC = AudioStream.cs Decoder.cs Player.cs Player.Designer.cs Program.cs
 $(FFMPEG_DIR)/Example.exe: $(addprefix $(FFMPEG_DIR)/, $(FFMPEG_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-ffmpeg /pkg:tao-openal $(SYSTEM_LIBS) $(DRAWING_LIBS)
 
-PHYSFS_DIR = PhysFsExamples.Simple
+PHYSFS_DIR = PhysFsExamples
 PHYSFS_SRC = Simple.cs
 $(PHYSFS_DIR)/Example.exe: $(addprefix $(PHYSFS_DIR)/, $(PHYSFS_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-physfs $(SYSTEM_LIBS)
 
-FREEGLUT_DIR = FreeGlutExamples.One
+FREEGLUT_DIR = FreeGlutExamples
 FREEGLUT_SRC = One.cs
 $(FREEGLUT_DIR)/Example.exe: $(addprefix $(FREEGLUT_DIR)/, $(FREEGLUT_SRC))
 	$(CSC) /out:$@ $^ /pkg:tao-freeglut $(SYSTEM_LIBS)
diff --git a/debian/changelog b/debian/changelog
index 12e043a..98d0b12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-taoframework (2.1.svn20090731-1) UNRELEASED; urgency=low
+taoframework (2.1.svn20090801-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
   * Removed all Debian patches, they have been merged upstream.
+  * Fixed the example directory installation.
 
   * debian/control:
     + Set package sections to cli-mono.
diff --git a/debian/rules b/debian/rules
index 629fab1..f8a6080 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,17 +44,6 @@ build-stamp: configure-stamp
 	#/usr/bin/mdassembler \
 	#	--out $(CURDIR)/build/doc/Tao \
 	#	$$(find $(CURDIR)/build/doc/tmp/ -mindepth 1 -maxdepth 1 | xargs printf '--ecma %s ')
-	## Copy examples contents
-	#for dir in $(shell find -maxdepth 2 -type d | grep '\(Examples\|NateRobins\|NeHe\|Redbook\)'); do \
-	#  base="$${dir##*/}"; \
-	#  mkdir -p $(CURDIR)/build/examples/$$base; \
-	#  cp $(CURDIR)/$$dir/*.cs \
-	#        $(CURDIR)/build/examples/$$base/; \
-	#  for subdir in Properties Data Resources; do \
-	#    [ ! -d $(CURDIR)/$$dir/$$subdir ] || \
-	#     cp -r $(CURDIR)/$$dir/$$subdir $(CURDIR)/build/examples/$$base/; \
-	#  done; \
-	#done
 	touch build-stamp
 
 clean:
@@ -63,7 +52,7 @@ clean:
 	#rm -f debian/*.config
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	#rm -rf $(CURDIR)/build
+	rm -rf $(CURDIR)/debian/examples
 	#for builddir in $(BUILDDIRS); do \
 	#  (cd Tao.$$builddir && [ ! -f Makefile ] || $(MAKE) distclean) || exit 1; \
 	#done
@@ -76,6 +65,18 @@ install: build
 	dh_clean -k 
 	$(MAKE) install DESTDIR=$$(pwd)/debian/tmp
 	
+	# Copy examples contents
+	mkdir -p $(CURDIR)/debian/examples
+	for dir in $(shell find $(CURDIR)/examples -maxdepth 1 -type d); do \
+	  base="$${dir##*/}"; \
+	  mkdir -p $(CURDIR)/debian/examples/$$base; \
+	  cp $(CURDIR)/$$dir/*.cs $(CURDIR)/debian/examples/$$base/; \
+	  for subdir in Properties Data Resources; do \
+	    [ ! -d $(CURDIR)/$$dir/$$subdir ] || \
+	     cp -r $(CURDIR)/$$dir/$$subdir $(CURDIR)/debian/examples/$$base/; \
+	  done; \
+	done
+	
 	# On Debian, we want stuff in /usr/lib/cli instead of /usr/lib/mono
 	# and we manage the GAC ourselves.
 	mkdir debian/tmp/usr/lib/cli
diff --git a/debian/taoframework-examples.examples b/debian/taoframework-examples.examples
index 44b38f3..2d3d1ae 100644
--- a/debian/taoframework-examples.examples
+++ b/debian/taoframework-examples.examples
@@ -1,2 +1,2 @@
+debian/examples/*
 debian/Makefile
-build/examples/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git