[cadcdev-svn-commits] SF.net SVN: cadcdev: [540] tiki

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 540
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=540&view=rev
Author:   atani
Date:     2007-11-07 12:11:05 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
package structure changes

Modified Paths:
--------------
    tiki/dc/Makefile
    tiki/nds/Makefile
    tiki/sdl/Makefile

Property Changed:
----------------
    tiki/examples/menu/basic/
    tiki/examples/menu/popup/

Modified: tiki/dc/Makefile
===================================================================

--- tiki/dc/Makefile	2007-11-07 15:56:21 UTC (rev 539)
+++ tiki/dc/Makefile	2007-11-07 20:11:05 UTC (rev 540)
@@ -28,16 +28,18 @@
 	$(MAKE) TIKI_PLAT=dc -C$(CURDIR)/../examples clean all
 
 package:
-	zip -9r ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-dc.zip libtiki.a
-	cd .. && \
-		zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-dc.zip \
-		include \
-		dc/include \
-		dc/Makefile.rules \
-		-x "*/.svn/*"
-	cd .. && \
-		zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-dc.zip \
-		examples/console/TikiSnake/tikisnake.elf \
-		-x "*/.svn/*"
+	mkdir ../dist/$(SVN_VERSION)/tmp
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library/dc
+	mkdir ../dist/$(SVN_VERSION)/tmp/Samples
+	svn export ../include ../dist/$(SVN_VERSION)/tmp/Library/include
+	svn export include ../dist/$(SVN_VERSION)/tmp/Library/dc/include
+	cp libtiki.a ../dist/$(SVN_VERSION)/tmp/Library/dc
+	cp Makefile.rules ../dist/$(SVN_VERSION)/tmp/Library/dc
+	find ../examples -name '*.elf' \
+		-exec cp {} ../dist/$(SVN_VERSION)/tmp/Samples \;
+	cd ../dist/$(SVN_VERSION)/tmp && \
+		zip -9r ../tiki-$(SVN_VERSION)-dc.zip Library Samples
+	rm -rf ../dist/$(SVN_VERSION)/tmp
 
 include Makefile.rules


Property changes on: tiki/examples/menu/basic
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
build
*.user
*.nds
*.ds.gba

   + Debug
Release
build
*.user
*.nds
*.ds.gba
menu_basic



Property changes on: tiki/examples/menu/popup
___________________________________________________________________
Name: svn:ignore
   - build
Debug
Release
*.user
*.nds
*.ds.gba

   + build
Debug
Release
*.user
*.nds
*.ds.gba
menu_popup


Modified: tiki/nds/Makefile
===================================================================
--- tiki/nds/Makefile	2007-11-07 15:56:21 UTC (rev 539)
+++ tiki/nds/Makefile	2007-11-07 20:11:05 UTC (rev 540)
@@ -64,34 +64,27 @@
 	$(MAKE) TIKI_PLAT=nds -C$(CURDIR)/../examples clean all
 
 package:
-	cd .. && \
-		zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
-		include \
-		nds/include \
-		nds/libtiki.a \
-		nds/tikiarm7 \
-		nds/Makefile.rules
-	cp ../examples/console/TikiSnake/resources/pc-ascii.png \
-		../examples/console/TikiSnake
-	cp ../examples/net/httpclient/resources/pc-ascii.png \
-		../examples/net/httpclient
-	cd .. && \
-		zip -9ru dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
-		examples/console/TikiSnake/pc-ascii.png \
-		examples/console/TikiSnake/tikisnake.nds \
-		examples/console/TikiSnake/tikisnake.ds.gba \
-		examples/net/basic/basic.nds \
-		examples/net/basic/basic.ds.gba \
-		examples/net/chat/chat.nds \
-		examples/net/chat/chat.ds.gba \
-		examples/net/chatd/chatd.nds \
-		examples/net/chatd/chatd.ds.gba \
-		examples/net/httpclient/pc-ascii.png \
-		examples/net/httpclient/httpclient.nds \
-		examples/net/httpclient/httpclient.ds.gba
-	rm -f ../examples/console/TikiSnake/pc-ascii.png ../examples/net/httpclient/pc-ascii.png
-	zip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-nds.zip \
-		-d '*.svn*'
+	mkdir ../dist/$(SVN_VERSION)/tmp
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library/nds
+	mkdir ../dist/$(SVN_VERSION)/tmp/Samples
+	mkdir ../dist/$(SVN_VERSION)/tmp/Samples/Resources
+	svn export ../include ../dist/$(SVN_VERSION)/tmp/Library/include
+	svn export include ../dist/$(SVN_VERSION)/tmp/Library/nds/include
+	cp libtiki.a ../dist/$(SVN_VERSION)/tmp/Library/nds
+	cp Makefile.rules ../dist/$(SVN_VERSION)/tmp/Library/nds
+	find $(wildcard $(TIKI_DIR)/examples/**/**/resources) \
+		$(wildcard $(TIKI_DIR)/examples/**/resources) \
+		-type f -maxdepth 1 \
+		-exec cp {} ../dist/$(SVN_VERSION)/tmp/Samples/Resources \;
+	find $(TIKI_DIR)/examples -name '*.nds' \
+		-exec cp {} ../dist/$(SVN_VERSION)/tmp/Samples \;
+	find $(TIKI_DIR)/examples -name '*.ds.gba' \
+		-exec cp {} ../dist/$(SVN_VERSION)/tmp/Samples \;
+	echo "Copy the contents of the Resources directory to the root of your flash card.\nThis is required by many of the Tiki samples" > ../dist/$(SVN_VERSION)/tmp/Samples/README.txt
+	cd ../dist/$(SVN_VERSION)/tmp && \
+		zip -9r ../tiki-$(SVN_VERSION)-nds.zip Library Samples
+	rm -rf ../dist/$(SVN_VERSION)/tmp
 
 DEPSDIR=$(CURDIR)
 include Makefile.rules

Modified: tiki/sdl/Makefile
===================================================================
--- tiki/sdl/Makefile	2007-11-07 15:56:21 UTC (rev 539)
+++ tiki/sdl/Makefile	2007-11-07 20:11:05 UTC (rev 540)
@@ -63,26 +63,31 @@
 	$(MAKE) TIKI_PLAT=sdl -C$(CURDIR)/../examples clean all
 
 package:
-	tar -cvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar libtiki.a
-	tar -uvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar -C ../ \
-		include \
-		sdl/include \
-		sdl/Makefile.rules \
-		--exclude .svn
-	cp ../examples/console/TikiSnake/resources/pc-ascii.png \
-		../examples/console/TikiSnake
-	cp ../examples/net/httpclient/resources/pc-ascii.png \
-		../examples/net/httpclient
-	tar -uvf ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar -C ../ \
-		examples/net/basic/basic \
-		examples/net/chat/chat \
-		examples/net/chatd/chatd \
-		examples/net/httpclient/httpclient \
-		examples/net/httpclient/pc-ascii.png \
-		examples/console/TikiSnake/tikisnake \
-		examples/console/TikiSnake/pc-ascii.png \
-		--exclude .svn
-	rm -f ../examples/console/TikiSnake/pc-ascii.png ../examples/net/httpclient/pc-ascii.png
-	gzip ../dist/$(SVN_VERSION)/tiki-$(SVN_VERSION)-sdl.tar
+	mkdir ../dist/$(SVN_VERSION)/tmp
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library
+	mkdir ../dist/$(SVN_VERSION)/tmp/Library/sdl
+	mkdir ../dist/$(SVN_VERSION)/tmp/Samples
+	svn export ../include ../dist/$(SVN_VERSION)/tmp/Library/include
+	svn export include ../dist/$(SVN_VERSION)/tmp/Library/sdl/include
+	cp libtiki.a ../dist/$(SVN_VERSION)/tmp/Library/sdl
+	cp Makefile.rules ../dist/$(SVN_VERSION)/tmp/Library/sdl
+	find $(wildcard ../examples/**/**/resources) \
+		$(wildcard ../examples/**/resources) \
+		-type f -maxdepth 1 \
+		-exec cp {} ../dist/$(SVN_VERSION)/tmp/Samples \;
+	cp ../examples/net/basic/basic \
+		../examples/net/chat/chat \
+		../examples/net/chatd/chatd \
+		../examples/net/httpclient/httpclient \
+		../examples/console/TikiSnake/tikisnake \
+		../examples/menu/basic/menu_basic \
+		../examples/menu/popup/menu_popup \
+		../examples/sound/sfx/sound_fx \
+		../dist/$(SVN_VERSION)/tmp/Samples
+	cd ../dist/$(SVN_VERSION)/tmp && \
+		tar -cvf ../tiki-$(SVN_VERSION)-sdl.tar \
+		Library Samples && \
+		gzip ../tiki-$(SVN_VERSION)-sdl.tar
+	rm -rf ../dist/$(SVN_VERSION)/tmp
 
 include Makefile.rules


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


