From 1a0b690eaa0a549b9954d10371d16bf031da7287 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 26 Mar 2013 14:53:13 +0100 Subject: [PATCH] Huge internal restructuring of the in sub-directories --- Makefile | 33 ++++++++++--- Extensions.st => core/Extensions.st | 0 LogAreas.st => core/LogAreas.st | 0 MessageBuffer.st => core/MessageBuffer.st | 0 .../MessageStructure.st | 0 TLV.st => core/TLV.st | 0 TLVTests.st => core/TLVTests.st | 0 IPAConstants.st => ipa/IPAConstants.st | 0 IPAConstantsGST.st => ipa/IPAConstantsGST.st | 0 IPADispatcher.st => ipa/IPADispatcher.st | 0 IPAMsg.st => ipa/IPAMsg.st | 0 IPAMuxer.st => ipa/IPAMuxer.st | 0 IPAProtoHandler.st => ipa/IPAProtoHandler.st | 0 IPATests.st => ipa/IPATests.st | 0 ISUP.st => isup/ISUP.st | 0 ISUPExtensions.st => isup/ISUPExtensions.st | 0 ISUPTests.st => isup/ISUPTests.st | 0 isup/{ => generator}/acm.txt | 0 isup/{ => generator}/amn.txt | 0 isup/{ => generator}/apt.txt | 0 isup/{ => generator}/blo.txt | 0 isup/{ => generator}/cfn.txt | 0 isup/{ => generator}/cgb.txt | 0 isup/{ => generator}/con.txt | 0 isup/{ => generator}/cot.txt | 0 isup/{ => generator}/cpg.txt | 0 isup/{ => generator}/cqr.txt | 0 isup/{ => generator}/create_structs.st | 0 isup/{ => generator}/faa.txt | 0 isup/{ => generator}/fac.txt | 0 isup/{ => generator}/fot.txt | 0 isup/{ => generator}/frj.txt | 0 isup/{ => generator}/gra.txt | 0 isup/{ => generator}/grs.txt | 0 isup/{ => generator}/iam.txt | 0 isup/{ => generator}/idr.txt | 0 isup/{ => generator}/ids.txt | 0 isup/{ => generator}/inf.txt | 0 isup/{ => generator}/inr.txt | 0 isup/{ => generator}/lpr.txt | 0 isup/{ => generator}/nrm.txt | 0 isup/{ => generator}/pri.txt | 0 isup/{ => generator}/rel.txt | 0 isup/{ => generator}/res.txt | 0 isup/{ => generator}/rlc.txt | 0 isup/{ => generator}/sam.txt | 0 isup/{ => generator}/same_bla.txt | 0 isup/{ => generator}/same_ccr.txt | 0 isup/{ => generator}/same_cgba.txt | 0 isup/{ => generator}/same_cgu.txt | 0 isup/{ => generator}/same_cgua.txt | 0 isup/{ => generator}/same_far.txt | 0 isup/{ => generator}/same_gra.txt | 0 isup/{ => generator}/same_lpa.txt | 0 isup/{ => generator}/same_olm.txt | 0 isup/{ => generator}/same_rsc.txt | 0 isup/{ => generator}/same_sus.txt | 0 isup/{ => generator}/same_uba.txt | 0 isup/{ => generator}/same_ubl.txt | 0 isup/{ => generator}/same_ucic.txt | 0 isup/{ => generator}/same_upa.txt | 0 isup/{ => generator}/san.txt | 0 isup/{ => generator}/seg.txt | 0 isup/{ => generator}/upt.txt | 0 isup/{ => generator}/usr.txt | 0 isup_generated.st => isup/isup_generated.st | 0 .../OsmoAppConnection.st | 0 OsmoCtrlGrammar.st => osmo/OsmoCtrlGrammar.st | 0 .../OsmoCtrlGrammarTest.st | 0 OsmoCtrlLogging.st => osmo/OsmoCtrlLogging.st | 0 SocketBase.st => osmo/OsmoUDPSocket.st | 0 package.xml | 48 +++++++++---------- .../changes_for_pharo.st | 0 .../compat_for_pharo.st | 0 SCCP.st => sccp/SCCP.st | 0 M2UA.st => ua/M2UA.st | 0 76 files changed, 50 insertions(+), 31 deletions(-) rename Extensions.st => core/Extensions.st (100%) rename LogAreas.st => core/LogAreas.st (100%) rename MessageBuffer.st => core/MessageBuffer.st (100%) rename MessageStructure.st => core/MessageStructure.st (100%) rename TLV.st => core/TLV.st (100%) rename TLVTests.st => core/TLVTests.st (100%) rename IPAConstants.st => ipa/IPAConstants.st (100%) rename IPAConstantsGST.st => ipa/IPAConstantsGST.st (100%) rename IPADispatcher.st => ipa/IPADispatcher.st (100%) rename IPAMsg.st => ipa/IPAMsg.st (100%) rename IPAMuxer.st => ipa/IPAMuxer.st (100%) rename IPAProtoHandler.st => ipa/IPAProtoHandler.st (100%) rename IPATests.st => ipa/IPATests.st (100%) rename ISUP.st => isup/ISUP.st (100%) rename ISUPExtensions.st => isup/ISUPExtensions.st (100%) rename ISUPTests.st => isup/ISUPTests.st (100%) rename isup/{ => generator}/acm.txt (100%) rename isup/{ => generator}/amn.txt (100%) rename isup/{ => generator}/apt.txt (100%) rename isup/{ => generator}/blo.txt (100%) rename isup/{ => generator}/cfn.txt (100%) rename isup/{ => generator}/cgb.txt (100%) rename isup/{ => generator}/con.txt (100%) rename isup/{ => generator}/cot.txt (100%) rename isup/{ => generator}/cpg.txt (100%) rename isup/{ => generator}/cqr.txt (100%) rename isup/{ => generator}/create_structs.st (100%) rename isup/{ => generator}/faa.txt (100%) rename isup/{ => generator}/fac.txt (100%) rename isup/{ => generator}/fot.txt (100%) rename isup/{ => generator}/frj.txt (100%) rename isup/{ => generator}/gra.txt (100%) rename isup/{ => generator}/grs.txt (100%) rename isup/{ => generator}/iam.txt (100%) rename isup/{ => generator}/idr.txt (100%) rename isup/{ => generator}/ids.txt (100%) rename isup/{ => generator}/inf.txt (100%) rename isup/{ => generator}/inr.txt (100%) rename isup/{ => generator}/lpr.txt (100%) rename isup/{ => generator}/nrm.txt (100%) rename isup/{ => generator}/pri.txt (100%) rename isup/{ => generator}/rel.txt (100%) rename isup/{ => generator}/res.txt (100%) rename isup/{ => generator}/rlc.txt (100%) rename isup/{ => generator}/sam.txt (100%) rename isup/{ => generator}/same_bla.txt (100%) rename isup/{ => generator}/same_ccr.txt (100%) rename isup/{ => generator}/same_cgba.txt (100%) rename isup/{ => generator}/same_cgu.txt (100%) rename isup/{ => generator}/same_cgua.txt (100%) rename isup/{ => generator}/same_far.txt (100%) rename isup/{ => generator}/same_gra.txt (100%) rename isup/{ => generator}/same_lpa.txt (100%) rename isup/{ => generator}/same_olm.txt (100%) rename isup/{ => generator}/same_rsc.txt (100%) rename isup/{ => generator}/same_sus.txt (100%) rename isup/{ => generator}/same_uba.txt (100%) rename isup/{ => generator}/same_ubl.txt (100%) rename isup/{ => generator}/same_ucic.txt (100%) rename isup/{ => generator}/same_upa.txt (100%) rename isup/{ => generator}/san.txt (100%) rename isup/{ => generator}/seg.txt (100%) rename isup/{ => generator}/upt.txt (100%) rename isup/{ => generator}/usr.txt (100%) rename isup_generated.st => isup/isup_generated.st (100%) rename OsmoAppConnection.st => osmo/OsmoAppConnection.st (100%) rename OsmoCtrlGrammar.st => osmo/OsmoCtrlGrammar.st (100%) rename OsmoCtrlGrammarTest.st => osmo/OsmoCtrlGrammarTest.st (100%) rename OsmoCtrlLogging.st => osmo/OsmoCtrlLogging.st (100%) rename SocketBase.st => osmo/OsmoUDPSocket.st (100%) rename changes_for_pharo.st => pharo-porting/changes_for_pharo.st (100%) rename compat_for_pharo.st => pharo-porting/compat_for_pharo.st (100%) rename SCCP.st => sccp/SCCP.st (100%) rename M2UA.st => ua/M2UA.st (100%) diff --git a/Makefile b/Makefile index faf1cb3..1ef3813 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,29 @@ CONVERT_RULES = -r'Osmo.LogManager->LogManager' \ # Can not be parsed right now.. # -r'(``@object => ``@args1)->(``@object ==> ``@args1)' +CORE = \ + core/Extensions.st core/MessageStructure.st core/MessageBuffer.st \ + core/LogAreas.st core/TLV.st core/TLVTests.st + +IPA = \ + ipa/IPAConstants.st ipa/IPADispatcher.st ipa/IPAMuxer.st \ + ipa/IPAProtoHandler.st ipa/IPAMsg.st \ + +SCCP = sccp/SCCP.st + +ISUP = \ + isup/ISUP.st isup/isup_generated.st isup/ISUPExtensions.st \ + isup/ISUPTests.st + +UA = \ + ua/M2UA.st + +OSMO = \ + osmo/OsmoUDPSocket.st osmo/OsmoCtrlLogging.st \ + osmo/OsmoCtrlGrammar.st osmo/OsmoAppConnection.st \ + osmo/OsmoCtrlGrammarTest.st + + all: @@ -26,12 +49,8 @@ all: convert: $(GST_CONVERT) $(CONVERT_RULES) -F squeak -f gst \ - -o fileout.st compat_for_pharo.st Extensions.st MessageStructure.st \ - ISUP.st isup_generated.st ISUPExtensions.st IPAConstants.st IPADispatcher.st \ - IPAMuxer.st IPAProtoHandler.st IPAMsg.st MessageBuffer.st SCCP.st \ - LogAreas.st M2UA.st SocketBase.st TLV.st OsmoCtrlLogging.st \ - OsmoCtrlGrammar.st OsmoAppConnection.st \ - Tests.st ISUPTests.st IPATests.st TLVTests.st OsmoCtrlGrammarTest.st \ - changes_for_pharo.st + -o fileout.st pharo-porting/compat_for_pharo.st \ + $(CORE) $(IPA) $(SCCP) $(ISUP) $(UA) $(OSMO) \ + Tests.st pharo-porting/changes_for_pharo.st sed -i s,"=>","==>",g fileout.st diff --git a/Extensions.st b/core/Extensions.st similarity index 100% rename from Extensions.st rename to core/Extensions.st diff --git a/LogAreas.st b/core/LogAreas.st similarity index 100% rename from LogAreas.st rename to core/LogAreas.st diff --git a/MessageBuffer.st b/core/MessageBuffer.st similarity index 100% rename from MessageBuffer.st rename to core/MessageBuffer.st diff --git a/MessageStructure.st b/core/MessageStructure.st similarity index 100% rename from MessageStructure.st rename to core/MessageStructure.st diff --git a/TLV.st b/core/TLV.st similarity index 100% rename from TLV.st rename to core/TLV.st diff --git a/TLVTests.st b/core/TLVTests.st similarity index 100% rename from TLVTests.st rename to core/TLVTests.st diff --git a/IPAConstants.st b/ipa/IPAConstants.st similarity index 100% rename from IPAConstants.st rename to ipa/IPAConstants.st diff --git a/IPAConstantsGST.st b/ipa/IPAConstantsGST.st similarity index 100% rename from IPAConstantsGST.st rename to ipa/IPAConstantsGST.st diff --git a/IPADispatcher.st b/ipa/IPADispatcher.st similarity index 100% rename from IPADispatcher.st rename to ipa/IPADispatcher.st diff --git a/IPAMsg.st b/ipa/IPAMsg.st similarity index 100% rename from IPAMsg.st rename to ipa/IPAMsg.st diff --git a/IPAMuxer.st b/ipa/IPAMuxer.st similarity index 100% rename from IPAMuxer.st rename to ipa/IPAMuxer.st diff --git a/IPAProtoHandler.st b/ipa/IPAProtoHandler.st similarity index 100% rename from IPAProtoHandler.st rename to ipa/IPAProtoHandler.st diff --git a/IPATests.st b/ipa/IPATests.st similarity index 100% rename from IPATests.st rename to ipa/IPATests.st diff --git a/ISUP.st b/isup/ISUP.st similarity index 100% rename from ISUP.st rename to isup/ISUP.st diff --git a/ISUPExtensions.st b/isup/ISUPExtensions.st similarity index 100% rename from ISUPExtensions.st rename to isup/ISUPExtensions.st diff --git a/ISUPTests.st b/isup/ISUPTests.st similarity index 100% rename from ISUPTests.st rename to isup/ISUPTests.st diff --git a/isup/acm.txt b/isup/generator/acm.txt similarity index 100% rename from isup/acm.txt rename to isup/generator/acm.txt diff --git a/isup/amn.txt b/isup/generator/amn.txt similarity index 100% rename from isup/amn.txt rename to isup/generator/amn.txt diff --git a/isup/apt.txt b/isup/generator/apt.txt similarity index 100% rename from isup/apt.txt rename to isup/generator/apt.txt diff --git a/isup/blo.txt b/isup/generator/blo.txt similarity index 100% rename from isup/blo.txt rename to isup/generator/blo.txt diff --git a/isup/cfn.txt b/isup/generator/cfn.txt similarity index 100% rename from isup/cfn.txt rename to isup/generator/cfn.txt diff --git a/isup/cgb.txt b/isup/generator/cgb.txt similarity index 100% rename from isup/cgb.txt rename to isup/generator/cgb.txt diff --git a/isup/con.txt b/isup/generator/con.txt similarity index 100% rename from isup/con.txt rename to isup/generator/con.txt diff --git a/isup/cot.txt b/isup/generator/cot.txt similarity index 100% rename from isup/cot.txt rename to isup/generator/cot.txt diff --git a/isup/cpg.txt b/isup/generator/cpg.txt similarity index 100% rename from isup/cpg.txt rename to isup/generator/cpg.txt diff --git a/isup/cqr.txt b/isup/generator/cqr.txt similarity index 100% rename from isup/cqr.txt rename to isup/generator/cqr.txt diff --git a/isup/create_structs.st b/isup/generator/create_structs.st similarity index 100% rename from isup/create_structs.st rename to isup/generator/create_structs.st diff --git a/isup/faa.txt b/isup/generator/faa.txt similarity index 100% rename from isup/faa.txt rename to isup/generator/faa.txt diff --git a/isup/fac.txt b/isup/generator/fac.txt similarity index 100% rename from isup/fac.txt rename to isup/generator/fac.txt diff --git a/isup/fot.txt b/isup/generator/fot.txt similarity index 100% rename from isup/fot.txt rename to isup/generator/fot.txt diff --git a/isup/frj.txt b/isup/generator/frj.txt similarity index 100% rename from isup/frj.txt rename to isup/generator/frj.txt diff --git a/isup/gra.txt b/isup/generator/gra.txt similarity index 100% rename from isup/gra.txt rename to isup/generator/gra.txt diff --git a/isup/grs.txt b/isup/generator/grs.txt similarity index 100% rename from isup/grs.txt rename to isup/generator/grs.txt diff --git a/isup/iam.txt b/isup/generator/iam.txt similarity index 100% rename from isup/iam.txt rename to isup/generator/iam.txt diff --git a/isup/idr.txt b/isup/generator/idr.txt similarity index 100% rename from isup/idr.txt rename to isup/generator/idr.txt diff --git a/isup/ids.txt b/isup/generator/ids.txt similarity index 100% rename from isup/ids.txt rename to isup/generator/ids.txt diff --git a/isup/inf.txt b/isup/generator/inf.txt similarity index 100% rename from isup/inf.txt rename to isup/generator/inf.txt diff --git a/isup/inr.txt b/isup/generator/inr.txt similarity index 100% rename from isup/inr.txt rename to isup/generator/inr.txt diff --git a/isup/lpr.txt b/isup/generator/lpr.txt similarity index 100% rename from isup/lpr.txt rename to isup/generator/lpr.txt diff --git a/isup/nrm.txt b/isup/generator/nrm.txt similarity index 100% rename from isup/nrm.txt rename to isup/generator/nrm.txt diff --git a/isup/pri.txt b/isup/generator/pri.txt similarity index 100% rename from isup/pri.txt rename to isup/generator/pri.txt diff --git a/isup/rel.txt b/isup/generator/rel.txt similarity index 100% rename from isup/rel.txt rename to isup/generator/rel.txt diff --git a/isup/res.txt b/isup/generator/res.txt similarity index 100% rename from isup/res.txt rename to isup/generator/res.txt diff --git a/isup/rlc.txt b/isup/generator/rlc.txt similarity index 100% rename from isup/rlc.txt rename to isup/generator/rlc.txt diff --git a/isup/sam.txt b/isup/generator/sam.txt similarity index 100% rename from isup/sam.txt rename to isup/generator/sam.txt diff --git a/isup/same_bla.txt b/isup/generator/same_bla.txt similarity index 100% rename from isup/same_bla.txt rename to isup/generator/same_bla.txt diff --git a/isup/same_ccr.txt b/isup/generator/same_ccr.txt similarity index 100% rename from isup/same_ccr.txt rename to isup/generator/same_ccr.txt diff --git a/isup/same_cgba.txt b/isup/generator/same_cgba.txt similarity index 100% rename from isup/same_cgba.txt rename to isup/generator/same_cgba.txt diff --git a/isup/same_cgu.txt b/isup/generator/same_cgu.txt similarity index 100% rename from isup/same_cgu.txt rename to isup/generator/same_cgu.txt diff --git a/isup/same_cgua.txt b/isup/generator/same_cgua.txt similarity index 100% rename from isup/same_cgua.txt rename to isup/generator/same_cgua.txt diff --git a/isup/same_far.txt b/isup/generator/same_far.txt similarity index 100% rename from isup/same_far.txt rename to isup/generator/same_far.txt diff --git a/isup/same_gra.txt b/isup/generator/same_gra.txt similarity index 100% rename from isup/same_gra.txt rename to isup/generator/same_gra.txt diff --git a/isup/same_lpa.txt b/isup/generator/same_lpa.txt similarity index 100% rename from isup/same_lpa.txt rename to isup/generator/same_lpa.txt diff --git a/isup/same_olm.txt b/isup/generator/same_olm.txt similarity index 100% rename from isup/same_olm.txt rename to isup/generator/same_olm.txt diff --git a/isup/same_rsc.txt b/isup/generator/same_rsc.txt similarity index 100% rename from isup/same_rsc.txt rename to isup/generator/same_rsc.txt diff --git a/isup/same_sus.txt b/isup/generator/same_sus.txt similarity index 100% rename from isup/same_sus.txt rename to isup/generator/same_sus.txt diff --git a/isup/same_uba.txt b/isup/generator/same_uba.txt similarity index 100% rename from isup/same_uba.txt rename to isup/generator/same_uba.txt diff --git a/isup/same_ubl.txt b/isup/generator/same_ubl.txt similarity index 100% rename from isup/same_ubl.txt rename to isup/generator/same_ubl.txt diff --git a/isup/same_ucic.txt b/isup/generator/same_ucic.txt similarity index 100% rename from isup/same_ucic.txt rename to isup/generator/same_ucic.txt diff --git a/isup/same_upa.txt b/isup/generator/same_upa.txt similarity index 100% rename from isup/same_upa.txt rename to isup/generator/same_upa.txt diff --git a/isup/san.txt b/isup/generator/san.txt similarity index 100% rename from isup/san.txt rename to isup/generator/san.txt diff --git a/isup/seg.txt b/isup/generator/seg.txt similarity index 100% rename from isup/seg.txt rename to isup/generator/seg.txt diff --git a/isup/upt.txt b/isup/generator/upt.txt similarity index 100% rename from isup/upt.txt rename to isup/generator/upt.txt diff --git a/isup/usr.txt b/isup/generator/usr.txt similarity index 100% rename from isup/usr.txt rename to isup/generator/usr.txt diff --git a/isup_generated.st b/isup/isup_generated.st similarity index 100% rename from isup_generated.st rename to isup/isup_generated.st diff --git a/OsmoAppConnection.st b/osmo/OsmoAppConnection.st similarity index 100% rename from OsmoAppConnection.st rename to osmo/OsmoAppConnection.st diff --git a/OsmoCtrlGrammar.st b/osmo/OsmoCtrlGrammar.st similarity index 100% rename from OsmoCtrlGrammar.st rename to osmo/OsmoCtrlGrammar.st diff --git a/OsmoCtrlGrammarTest.st b/osmo/OsmoCtrlGrammarTest.st similarity index 100% rename from OsmoCtrlGrammarTest.st rename to osmo/OsmoCtrlGrammarTest.st diff --git a/OsmoCtrlLogging.st b/osmo/OsmoCtrlLogging.st similarity index 100% rename from OsmoCtrlLogging.st rename to osmo/OsmoCtrlLogging.st diff --git a/SocketBase.st b/osmo/OsmoUDPSocket.st similarity index 100% rename from SocketBase.st rename to osmo/OsmoUDPSocket.st diff --git a/package.xml b/package.xml index 003f4c9..46becbf 100644 --- a/package.xml +++ b/package.xml @@ -7,26 +7,26 @@ PetitParser Sockets - Extensions.st - MessageStructure.st - ISUP.st - isup_generated.st - ISUPExtensions.st - IPAConstants.st - IPAConstantsGST.st - IPADispatcher.st - IPAMuxer.st - IPAProtoHandler.st - IPAMsg.st - MessageBuffer.st - SCCP.st - M2UA.st - LogAreas.st - SocketBase.st - TLV.st - OsmoCtrlLogging.st - OsmoCtrlGrammar.st - OsmoAppConnection.st + core/Extensions.st + core/MessageStructure.st + core/MessageBuffer.st + core/LogAreas.st + core/TLV.st + isup/ISUP.st + isup/isup_generated.st + isup/ISUPExtensions.st + ipa/IPAConstants.st + ipa/IPAConstantsGST.st + ipa/IPADispatcher.st + ipa/IPAMuxer.st + ipa/IPAProtoHandler.st + ipa/IPAMsg.st + sccp/SCCP.st + ua/M2UA.st + osmo/OsmoUDPSocket.st + osmo/OsmoCtrlLogging.st + osmo/OsmoCtrlGrammar.st + osmo/OsmoAppConnection.st @@ -43,9 +43,9 @@ Osmo.CtrlGrammarTest Osmo.CtrlParserTest Tests.st - ISUPTests.st - IPATests.st - TLVTests.st - OsmoCtrlGrammarTest.st + core/TLVTests.st + isup/ISUPTests.st + ipa/IPATests.st + osmo/OsmoCtrlGrammarTest.st diff --git a/changes_for_pharo.st b/pharo-porting/changes_for_pharo.st similarity index 100% rename from changes_for_pharo.st rename to pharo-porting/changes_for_pharo.st diff --git a/compat_for_pharo.st b/pharo-porting/compat_for_pharo.st similarity index 100% rename from compat_for_pharo.st rename to pharo-porting/compat_for_pharo.st diff --git a/SCCP.st b/sccp/SCCP.st similarity index 100% rename from SCCP.st rename to sccp/SCCP.st diff --git a/M2UA.st b/ua/M2UA.st similarity index 100% rename from M2UA.st rename to ua/M2UA.st