This commit is contained in:
Ren RenJuan 2014-01-19 23:40:41 +00:00
parent fafc5f2801
commit f7ca19e663
4 changed files with 186 additions and 108 deletions

195
.cproject
View File

@ -55,31 +55,8 @@
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="clean" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="all" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="tests" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>tests</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="libACTK1_0.so" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>libACTK1_0.so</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -87,6 +64,7 @@
</target>
<target name="clean" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -94,7 +72,6 @@
</target>
<target name="tests" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>tests</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -102,7 +79,6 @@
</target>
<target name="dirs" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>dirs</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -110,7 +86,6 @@
</target>
<target name="dclean" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>dclean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -118,6 +93,7 @@
</target>
<target name="all" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>all</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
@ -125,82 +101,20 @@
</target>
<target name="xsd2xml" path="ACTK1_0" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>xsd2xml</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="dirs" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>dirs</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="ausreg_cd" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>ausreg_cd</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="apig-cli" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>apig-cli</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="build/commander.o" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>build/commander.o</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="cliever" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>cliever</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="clean" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>clean</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="distclean" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>distclean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="build/ausreg-md" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>build/ausreg-md</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="AusRegEPPTK.so" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="all" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>all</buildTarget>
@ -208,15 +122,14 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="tests" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="tests" path="ACTK1_3_2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>tests</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="clean" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>clean</buildTarget>
@ -224,6 +137,102 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="dirs" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>dirs</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="apig-cli" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>apig-cli</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="build/commander.o" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>build/commander.o</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="build/ausreg-cd" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>build/ausreg-cd</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="cliever" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>cliever</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="all" path="APIG" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="AusRegEPPTK.so" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="tests" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>tests</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="AusRegEPPTK" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>clean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="cliever" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>cliever</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>clean</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="distclean" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>distclean</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="build/ausreg-md" path="AusRegCliever" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildTarget>build/ausreg-md</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
</buildTargets>
</storageModule>
</cproject>

View File

@ -33,7 +33,9 @@ SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) -l boost_system -l boost_thread -l log4c
ifeq ($(LOCATION),authoring)
SINCL= -I include -I ../AusRegCliever/include -I /usr/include/log4cpp $(BOSINCL)
CSINCL= -I include -I ../AusRegCliever/include -I /usr/include/log4cpp $(BOSINCL) /usr/include/xsd/cxx /usr/local/include/xercesc
CFLAGS= -DCURRENT_DEBUG=1000 -ggdb3
RESOURCES=../../resources
endif
CLIBS= -L$(USRLIB)
@ -46,15 +48,20 @@ CLFLAGS= -Wall -Wundef -Wpointer-arith -Wshadow \
ACOBJS= build/cliever.o build/cdLogger.o build/clientDaemonConfig.o \
build/clientDaemon.o build/commander.o build/mdBehavior.o
EPPOBJS= build/epp-1.0.o build/eppcom-1.0.o build/registrant-1.0.o \
build/domain-1.0.o build/host-1.0.o build/contact-1.0.o
# --- targets
#
ifeq ($(LOCATION),authoring)
all: cliever
all: cliever ausreg-cd
endif
cliever: build/$(CLIENT)-cd
cliever: build/$(CLIENT)-cd
ausreg-cd: build/ausreg-cd
.c.o:
$(Cc) -c $(CLFLAGS) -o $<
@ -82,16 +89,64 @@ client/mdClientState.cpp:
bin/before client/mdClientState mdClientState\.cc >include/mdClientState.h
rm src/client/mdClientState
client/epp-1.0.cpp: $(RESOURCES)/epp-1.0.xsd
xsd cxx-parser $(RESOURCES)/epp-1.0.xsd
mv epp-1.0-pskel.cxx client/epp-1.0.cpp
mv epp-1.0-pskel.hxx include/epp-1.0.hpp
client/eppcom-1.0.cpp: $(RESOURCES)/eppcom-1.0.xsd
xsd cxx-parser $(RESOURCES)/eppcom-1.0.xsd
mv eppcom-1.0-pskel.cxx client/eppcom-1.0.cpp
mv eppcom-1.0-pskel.hxx include/eppcom-1.0.hpp
client/host-1.0.cpp: $(RESOURCES)/host-1.0.xsd
xsd cxx-parser $(RESOURCES)/host-1.0.xsd
mv host-1.0-pskel.cxx client/host-1.0.cpp
mv host-1.0-pskel.hxx include/host-1.0.hpp
client/domain-1.0.cpp: $(RESOURCES)/domain-1.0.xsd
xsd cxx-parser $(RESOURCES)/domain-1.0.xsd
mv domain-1.0-pskel.cxx client/domain-1.0.cpp
mv domain-1.0-pskel.hxx include/domain-1.0.hpp
client/registrant-1.0.cpp: $(RESOURCES)/registrant-1.0.xsd
xsd cxx-parser $(RESOURCES)/registrant-1.0.xsd
mv registrant-1.0-pskel.cxx client/registrant-1.0.cpp
mv registrant-1.0-pskel.hxx include/registrant-1.0.hpp
client/contact-1.0.cpp: $(RESOURCES)/contact-1.0.xsd
xsd cxx-parser $(RESOURCES)/contact-1.0.xsd
mv contact-1.0-pskel.cxx client/contact-1.0.cpp
mv contact-1.0-pskel.hxx include/contact-1.0.hpp
build/epp-1.0.o:
$(CC) $(CFLAGS) client/epp-1.0.cpp -c -o build/epp-1.0.o $(CSINCL)
build/eppcom-1.0.o:
$(CC) $(CFLAGS) client/eppcom-1.0.cpp -c -o build/eppcom-1.0.o $(CSINCL)
build/host-1.0.o:
$(CC) $(CFLAGS) client/host-1.0.cpp -c -o build/host-1.0.o $(CSINCL)
build/domain-1.0.o:
$(CC) $(CFLAGS) client/domain-1.0.cpp -c -o build/domain-1.0.o $(CSINCL)
build/registrant-1.0.o:
$(CC) $(CFLAGS) client/registrant-1.0.cpp -c -o build/registrant-1.0.o $(CSINCL)
build/contact-1.0.o:
$(CC) $(CFLAGS) client/contact-1.0.cpp -c -o build/contact-1.0.o $(CSINCL)
build/cdLogger.o: client/cdLogger.cpp include/cdLogger.h
$(CC) $(CFLAGS) client/cdLogger.cpp -c -o build/cdLogger.o $(SINCL)
build/cliever.o: client/ausreg-cd.cpp include/*.h
build/cliever.o: client/ausreg-cd.cpp include/ausreg-cd.h
$(CC) $(CFLAGS) client/ausreg-cd.cpp -c -o build/cliever.o $(SINCL) $(DEF_XML_RPC) $(XMLRPC_INCL)
build/clientDaemonConfig.o: client/clientDaemonConfig.cpp include/clientDaemonConfig.h
$(CC) $(CFLAGS) client/clientDaemonConfig.cpp -c -o build/clientDaemonConfig.o $(SINCL)
build/clientDaemon.o: client/clientDaemon.cpp include/*.h
build/clientDaemon.o: client/clientDaemon.cpp include/clientDaemon.h
$(CC) $(CFLAGS) client/clientDaemon.cpp -c -o build/clientDaemon.o $(SINCL)
build/mdBehavior.o: client/mdBehavior.cpp include/mdBehavior.h
@ -103,6 +158,9 @@ build/commander.o: client/commander.cpp include/mdCommander.h include/eppargs.h
build/$(CLIENT)-cd: $(ACOBJS)
$(CC) $(CFLAGS) -o build/$(CLIENT)-cd $(SINCL) $(LIBS) $(ACOBJS) $(SLIBS) $(XMLRPC_LIB)
build/ausreg-cd: $(ACOBJS) $(EPPOBJS)
$(CC) $(CFLAGS) -o build/ausreg-cd $(SINCL) $(LIBS) $(ACOBJS) $(EPPOBJS) $(SLIBS) $(XMLRPC_LIB)
build/apig-cli: build/mdClientBehavior.o build/mdClientState.o build/mdClientDevice.o \
build/tools.o build/coretestbucket.o client/apig-cli.cpp
$(CC) $(CFLAGS) client/apig-cli.cpp $(CLIBS) $(CINCL) -o build/apig-cli build/tools.o build/coretestbucket.o \
@ -133,6 +191,14 @@ clean:
find ./build -name "*.o" -print | perl -ne "print;chop;unlink"
find ./build -name "*.rpo" -print | perl -ne "print;chop;unlink"
rm build/$(CLIENT)-cd
skeleton:
clrbak
find ./build -name "*.o" -print | perl -ne "print;chop;unlink"
find ./build -name "*.rpo" -print | perl -ne "print;chop;unlink"
rm client/*-1.0.cpp
rm include/*-1.0.hpp
rm build/$(CLIENT)-cd

View File

@ -376,9 +376,9 @@ void mdCommander::eppMainMenu() {
doHeader();
mvprintw(5,10," Create a new EPP command");
mvprintw(7,10,"Queries");
mvprintw(8,10," c - check");
mvprintw(9,10," i - info");
mvprintw(7,10, "Queries");
mvprintw(8,10, " c - check");
mvprintw(9,10, " i - info");
mvprintw(10,10," p - poll");
mvprintw(11,10," t - transfer query");
mvprintw(12,10,"Transactions");
@ -388,8 +388,8 @@ void mdCommander::eppMainMenu() {
mvprintw(16,10," D - delete");
mvprintw(17,10," T - transfer");
mvprintw(19,10,"IO (active this screen only)");
mvprintw(20,10," l<n> - load the schema");
mvprintw(21,10," L - load ./resources/*");
mvprintw(20,10," l<n> - load schema <n>");
mvprintw(21,10," L - load schemata");
mvprintw(22,10," w<letter> - write blank XML form for 1 above ... ");
mvprintw(23,10," W - or all to ./xml.");
mvprintw(24,10," v<letter> - vi/xmledit a blank XML form");
@ -398,11 +398,12 @@ void mdCommander::eppMainMenu() {
mvprintw(7,50, "EPP command schemata are defined by XSDs in ./resources.");
mvprintw(8,50, "Originals from the 2007 toolkit are updated to what's @");
mvprintw(9,50, "http://www.iana.org/assignments/xml-registry/xml-registry.xhtml");
mvprintw(10,50,"What's loaded here is generated in the build from those xsds.");
mvprintw(12,50,"If no schemata loaded you'll see stubs in the internal editor.");
mvprintw(11,50,"Load schema means to activate the code generated from the xsds");
mvprintw(12,50,"and attach it to the commands.");
mvprintw(14,50,"Without this you'll see stub commands in the internal editor.");
mvprintw(15,50," n = 1 : epp-1.0.xsd 2: domain-1-0.xsd 3: contact-1.0.xsd");
mvprintw(16,50," 4: registrant-1.0.xsd 5: host-1-0.xsd 6: kv-1.0.xsd");
mvprintw(16,50," n = 1 : epp-1.0.xsd 2: domain-1-0.xsd 3: contact-1.0.xsd");
mvprintw(17,50," 4: registrant-1.0.xsd 5: host-1-0.xsd 6: kv-1.0.xsd");
say((char *)"Action sequence or ? to exit");
}

6
README
View File

@ -40,7 +40,9 @@
The Code Synthesis xsd program is used to construct
c++ objects from the XSD files defining EPP XML.
The generated code is treated like object code and
not tracked in the git repo.
The generated code is tracked in git because it's
tedious to redo the work needed to get compilable
state and easies just to let it move with everything
else.