eas-dev-commit

[Andrey C. <sku...@us...>]

Update of /cvsroot/eas-dev/ocmng
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6950

Modified Files:
	Makefile 
Added Files:
	ALL.xml README component.dtd 
Removed Files:
	_a1 _a2 _test1.xml cleanxmo.sh funcs_a.prg funcs_c.prg 
	funcs_d.prg funcs_i.prg funcs_i.prg.1 funcs_s.prg ocmng.ch 
	ocmng.prg ocmng_compil.prg ocmng_dump.prg ocmng_install.prg 
	xml2xmo.prg 
Log Message:
Move all components to top level. Remove ocmng and xml2xmo sources. Add components:
- dbconsole
- form_menu, form_action and form_localization for menu generation
- update form component for generation menu

--- NEW FILE: ALL.xml ---
<?xml version="1.0" encoding="koi8-r" ?>

<component>

	<requires>
		<dependence type="component">CORE/ALL.xml</dependence>
		<dependence type="component">ocmng/ALL.xml</dependence>
		<dependence type="component">r2d2/ALL.xml</dependence>
		<dependence type="component">ref1/ALL.xml</dependence>
		<dependence type="component">ref2/ALL.xml</dependence>
		<dependence type="component">employee/ALL.xml</dependence>
		<dependence type="component">equipment/ALL.xml</dependence>
		<dependence type="component">acc-kernel/ALL.xml</dependence>
		<dependence type="component">acc-pdoc/ALL.xml</dependence>
	</requires>

	<files>
		<file name="README" type="text/text">Readme</file>
	</files>


</component>


--- NEW FILE: README ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: component.dtd ---
<!-- 
	DTD for CLIP component format 
	Version: 1.0rc
	Date: 06 Apr 2006
	Author: Andrey Cherepanov <sib...@ma...>
	Last version: http://eas.lrn.ru/dtd/component.dtd

	For check component XML type:
	xmllint -noout -dtdvalid component.dtd <component.xml>
	(replace '-' by double '-')
-->

<!-- Root tag -->
<!ELEMENT component (     
			name, 
  			category*, 
			version, 
			description?,
			license?,
			created?,
			modified?,
			author*,
			property*,
			requires?,
			files?,
			dictionary?,
			meta*,
			data*,
			install?,
			uninstall?,
			locale* )*
  		    >

<!-- Component name. Required. -->
<!ELEMENT name (#PCDATA)>

<!-- Component category (path delimited by '/': Base/Directories/Finance). Optional. -->
<!ELEMENT category (#PCDATA)>

<!-- Component brief description. Optional. -->
<!ELEMENT description (#PCDATA)>

<!-- Component version. Required. -->
<!ELEMENT version (#PCDATA)>

<!-- Component license. Optional. -->
<!ELEMENT license (#PCDATA)>

<!-- Component creation date (yyyy-mm-dd). Optional. -->
<!ELEMENT created (#PCDATA)>

<!-- Component modification date (yyyy-mm-dd). Optional. -->
<!ELEMENT modified (#PCDATA)>

<!-- Component author. Optional. -->
<!ELEMENT author (#PCDATA|name|email|copyright)*>
<!ELEMENT email (#PCDATA)>
<!ELEMENT copyright (#PCDATA)>

<!-- Custom property. Optional. -->
<!ELEMENT property (#PCDATA)>
<!ATTLIST property
	name CDATA #REQUIRED
>

<!-- Component requirements. Optional. -->
<!ELEMENT requires (dependence*)>
<!ELEMENT dependence (#PCDATA)>
<!ATTLIST dependence
	type	CDATA #REQUIRED
	version CDATA #IMPLIED
>
<!ELEMENT function (#PCDATA)>

<!-- Component files. Optional. -->
<!ELEMENT files (file*)>
<!ELEMENT file (#PCDATA)>
<!ATTLIST file
	name 		CDATA #REQUIRED
	form 		CDATA #IMPLIED
	type 		CDATA #IMPLIED
>

<!-- Dictionary -->
<!ELEMENT dictionary ( id, name, type?, path, dbUser? )>
<!ELEMENT id 		(#PCDATA)>
<!ELEMENT type 		(#PCDATA)>
<!ELEMENT path 		(#PCDATA)>
<!ELEMENT dbUser 	(#PCDATA)>


<!-- Database structure and data. Optional. -->
<!ELEMENT meta (	depository|
			extent|
			attribute|
			index|
			class|
			counter|
			tcolumn|
			tview|
			report|
			plugin|
			user|
			group)*>
<!ATTLIST meta
	dictionary CDATA #REQUIRED
>

<!-- Depository -->
<!ELEMENT depository (#PCDATA)>
<!ATTLIST depository
	id   	 ID    #IMPLIED
	name 	 CDATA #REQUIRED
	number 	 CDATA #IMPLIED
	memoSize CDATA #IMPLIED
>

<!-- Extent -->
<!ELEMENT extent (#PCDATA)>
<!ATTLIST extent
	id   ID	   #IMPLIED
	name CDATA #REQUIRED
>

<!-- Attribute -->
<!ELEMENT attribute (#PCDATA)>
<!ATTLIST attribute
	id   	 ID    #IMPLIED
	name 	 CDATA #REQUIRED
	type 	 (string|number|date|logical|text|object|any|ref|classref|array|code) #REQUIRED
	len  	 CDATA #IMPLIED
	dec  	 CDATA #IMPLIED
	lenType  (ignore|rtrim|alltrim|fill) #IMPLIED
	refTo 	 CDATA #IMPLIED
	defValue CDATA #IMPLIED
	counter  CDATA #IMPLIED
	notNull  (yes|no|true|false) #IMPLIED
	notEmpty (yes|no|true|false) #IMPLIED
	mask     CDATA #IMPLIED
	source   CDATA #IMPLIED
	code     CDATA #IMPLIED
	count  	 CDATA #IMPLIED
>

<!-- Index -->
<!ELEMENT index (#PCDATA)>
<!ATTLIST index
	id   	   ID    #IMPLIED
	name 	   CDATA #REQUIRED
	expression CDATA #REQUIRED
>

<!-- Class -->
<!ELEMENT class (#PCDATA|object)*>
<!ATTLIST class
	id   	   ID    #IMPLIED
	name 	   CDATA #REQUIRED
	superClass CDATA #IMPLIED
	extent	   CDATA #IMPLIED
	essence    CDATA #IMPLIED
	expression CDATA #IMPLIED
	uniqueKey  CDATA #IMPLIED
	logNeed	    (yes|no|true|false) #IMPLIED
	hasCounters (yes|no|true|false) #IMPLIED
	attributes CDATA #IMPLIED
	indices	   CDATA #IMPLIED
>

<!-- Counter -->
<!ELEMENT counter (#PCDATA)>
<!ATTLIST counter
	id         ID    #IMPLIED
	name       CDATA #REQUIRED
	value      CDATA #REQUIRED
	type  	   CDATA #IMPLIED
	depository CDATA #IMPLIED
	maxValue   CDATA #IMPLIED
	lastValue  CDATA #IMPLIED
>

<!-- TColumn -->
<!ELEMENT tcolumn (#PCDATA)>
<!ATTLIST tcolumn
	id   	ID    #IMPLIED
	name 	CDATA #REQUIRED
	header 	CDATA #IMPLIED
	footer 	CDATA #IMPLIED
	width  	CDATA #IMPLIED
	expression CDATA #IMPLIED
	depend 	CDATA #IMPLIED
	ref  	CDATA #IMPLIED
>

<!-- TView -->
<!ELEMENT tview (#PCDATA)>
<!ATTLIST tview
	id   	ID    #IMPLIED
	name 	CDATA #REQUIRED
	class  	CDATA #IMPLIED
	extent 	CDATA #IMPLIED
	group  	CDATA #IMPLIED
	user   	CDATA #IMPLIED
	header 	CDATA #IMPLIED
	footer 	CDATA #IMPLIED
	columns	CDATA #IMPLIED
>

<!-- Report-->
<!ELEMENT report (#PCDATA)>
<!ATTLIST report
	id   	ID    #IMPLIED
	name 	CDATA #REQUIRED
	type  	CDATA #IMPLIED
	file    CDATA #IMPLIED
	class  	CDATA #IMPLIED
	extent 	CDATA #IMPLIED
	group  	CDATA #IMPLIED
	user   	CDATA #IMPLIED
>

<!-- Plugin -->
<!ELEMENT plugin (#PCDATA)>
<!ATTLIST plugin
	id   	ID    #IMPLIED
	name 	CDATA #REQUIRED
	class  	CDATA #IMPLIED
	type  	CDATA #IMPLIED
	file  	CDATA #IMPLIED
	function CDATA #IMPLIED
>

<!-- User -->
<!ELEMENT user (#PCDATA)>
<!ATTLIST user
	id       ID    #IMPLIED
	name     CDATA #REQUIRED
	group    CDATA #IMPLIED
	access   CDATA #IMPLIED
>

<!-- Group -->
<!ELEMENT group (#PCDATA)>
<!ATTLIST group
	id   ID	   #IMPLIED
	name CDATA #REQUIRED
>

<!-- Default data -->
<!ELEMENT data ( objects* )>

<!ELEMENT objects (object+)>			
<!ATTLIST objects
	class 		CDATA #REQUIRED
	depository	CDATA #REQUIRED
>

<!-- Object contents -->
<!ELEMENT object (attr+)>			
<!ATTLIST object
	id 	 ID #IMPLIED
>

<!ELEMENT attr (#PCDATA|value)*>
<!ATTLIST attr
	name  CDATA #REQUIRED
	refTo CDATA #IMPLIED
>
<!ELEMENT value (#PCDATA|value)*>
<!ATTLIST value
	type  (string|number|date|logical|text|object|any|ref|classref|array|code) #REQUIRED
	refTo CDATA #IMPLIED
	meta  CDATA #IMPLIED
>

      
<!-- Install actions. Optional. -->
<!ELEMENT install (#PCDATA)>

<!-- Uninstall actions. Optional. -->
<!ELEMENT uninstall (#PCDATA)>

<!-- Component l10n. Optional. -->
<!ELEMENT locale (name?, description?, message*)>
<!ATTLIST locale
	lang CDATA #REQUIRED
>
<!ELEMENT message (#PCDATA)>
<!ATTLIST message
	id CDATA #REQUIRED
>

Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	21 Jun 2006 07:53:05 -0000	1.3
+++ Makefile	3 Nov 2006 16:31:53 -0000	1.4
@@ -3,46 +3,20 @@
 endif
 CLIP	= $(CLIPROOT)/bin/clip
 CLIPFLAGS = -alwO
-CLIPLIBS  = -lclip-codb
-OBJS = funcs_a.o funcs_c.o funcs_d.o funcs_i.o
-INCS = funcs_s.prg ocmng.ch
-PROGS = ocmng$(EXESUFF) xml2xmo$(EXESUFF)
-#PROGS = ocmng_compil$(EXESUFF) ocmng_dump$(EXESUFF) ocmng_install$(EXESUFF) ocmng$(EXESUFF)
-PODIRS = components/ocmng
+PODIRS = EAS
 PACKAGE= ocmng
 
 .SUFFIXES: .prg .o .po
 
-all: $(OBJS) $(PROGS)
+all: 
 	for dir in $(PODIRS);do cd $$dir && make;done
-	./xml2xmo components
+	xml2xmo .
 
 clean:
-	rm -f $(PROGS) *.so *.ex *.nm *.uri *.c *.s *.o *.a *.po *.log *.pa *.b *.BAK *.bak *~ core* *core
 	for dir in $(PODIRS);do cd $$dir && make clean;done
-	./cleanxmo.sh
-
-ocmng_compil$(EXESUFF): ocmng_compil.prg $(OBJS) $(INCS)
-	$(CLIP) $(CLIPFLAGS) -esM ocmng_compil.prg $(OBJS) $(CLIPLIBS)
-
-ocmng_install$(EXESUFF): ocmng_install.prg $(OBJS) $(INCS)
-	$(CLIP) $(CLIPFLAGS) -esM ocmng_install.prg $(OBJS) $(CLIPLIBS)
-
-ocmng_dump$(EXESUFF): ocmng_dump.prg  $(OBJS) $(INCS)
-	$(CLIP) $(CLIPFLAGS) -esM ocmng_dump.prg $(OBJS) $(CLIPLIBS)
-
-ocmng$(EXESUFF): ocmng.prg  $(OBJS) $(INCS)
-	$(CLIP) $(CLIPFLAGS) -esM ocmng.prg $(OBJS) $(CLIPLIBS)
-
-xml2xmo$(EXESUFF): xml2xmo.prg  $(OBJS) $(INCS)
-	$(CLIP) $(CLIPFLAGS) -esM xml2xmo.prg $(OBJS) $(CLIPLIBS)
+	cleanxmo.sh
 
 install:
-	cp $(PROGS) $(DESTDIR)$(CLIPROOT)/bin
 
 dist: clean
 	@cd .. && tar cvzf $(PACKAGE)-`date +%Y%m%d | tr -d '\n'`.tar.gz `find $(PACKAGE) ! -type d | grep -v CVS`
-
-.prg.o:
-	$(CLIP) $(CLIPFLAGS) $<
-

--- _a1 DELETED ---

--- _a2 DELETED ---

--- _test1.xml DELETED ---

--- cleanxmo.sh DELETED ---

--- funcs_a.prg DELETED ---

--- funcs_c.prg DELETED ---

--- funcs_d.prg DELETED ---

--- funcs_i.prg DELETED ---

--- funcs_i.prg.1 DELETED ---

--- funcs_s.prg DELETED ---

--- ocmng.ch DELETED ---

--- ocmng.prg DELETED ---

--- ocmng_compil.prg DELETED ---

--- ocmng_dump.prg DELETED ---

--- ocmng_install.prg DELETED ---

--- xml2xmo.prg DELETED ---