[Arsperl-devel] ARSperl Makefile.PL, 1.84, 1.85 StructDef.pl, 1.8, 1.9 supportrev_generated.c, 1.9,
Brought to you by:
jeffmurphy
Menu
▾
▴
[Arsperl-devel] ARSperl Makefile.PL, 1.84, 1.85 StructDef.pl, 1.8, 1.9 supportrev_generated.c, 1.9, 1.10 supportrev_generated.h, 1.8, 1.9
|
From: Thilo S. <ts...@us...> - 2009-04-14 16:58:31
|
Update of /cvsroot/arsperl/ARSperl In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4321 Modified Files: Makefile.PL StructDef.pl supportrev_generated.c supportrev_generated.h Log Message: directory reorganization/cleanup (fixed) Index: supportrev_generated.c =================================================================== RCS file: /cvsroot/arsperl/ARSperl/supportrev_generated.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** supportrev_generated.c 2 Apr 2009 18:57:04 -0000 1.9 --- supportrev_generated.c 14 Apr 2009 16:58:24 -0000 1.10 *************** *** 10426,10430 **** ! int rev_ARMultiSchemaSortList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortList *p ){ --- 10426,10430 ---- ! #if AR_CURRENT_API_VERSION >= 14 int rev_ARMultiSchemaSortList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortList *p ){ *************** *** 10498,10505 **** return 0; } ! ! int rev_ARMultiSchemaSortStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortStruct *p ){ --- 10498,10505 ---- return 0; } + #endif ! #if AR_CURRENT_API_VERSION >= 14 int rev_ARMultiSchemaSortStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortStruct *p ){ *************** *** 10581,10585 **** return 0; } ! --- 10581,10585 ---- return 0; } ! #endif Index: supportrev_generated.h =================================================================== RCS file: /cvsroot/arsperl/ARSperl/supportrev_generated.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** supportrev_generated.h 2 Apr 2009 18:57:04 -0000 1.8 --- supportrev_generated.h 14 Apr 2009 16:58:24 -0000 1.9 *************** *** 272,281 **** EXTERN int rev_ARMultiSchemaRelOpStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaRelOpStruct *p ); #endif ! EXTERN int rev_ARMultiSchemaSortList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortList *p ); ! ! EXTERN int rev_ARMultiSchemaSortStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortStruct *p ); ! #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaStatHistoryValue( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaStatHistoryValue *p ); --- 272,281 ---- EXTERN int rev_ARMultiSchemaRelOpStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaRelOpStruct *p ); #endif ! #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaSortList( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortList *p ); ! #endif ! #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaSortStruct( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaSortStruct *p ); ! #endif #if AR_CURRENT_API_VERSION >= 14 EXTERN int rev_ARMultiSchemaStatHistoryValue( ARControlStruct *ctrl, HV *h, char *k, ARMultiSchemaStatHistoryValue *p ); Index: Makefile.PL =================================================================== RCS file: /cvsroot/arsperl/ARSperl/Makefile.PL,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** Makefile.PL 2 Apr 2009 18:57:03 -0000 1.84 --- Makefile.PL 14 Apr 2009 16:58:24 -0000 1.85 *************** *** 58,62 **** $ARSVERSION = 7.5; ! # STEP 3 -> Choose whether or not to enable encryption # # 0 -> No encryption library linking --- 58,73 ---- $ARSVERSION = 7.5; ! ! # STEP 3 -> Choose architecture dependent suffix for library names, if necessary ! $ARCHITECTURE = ""; ! # $ARCHITECTURE = "hpia32": # HPUX Itanium 32-bit ! # $ARCHITECTURE = "hpia64": # HPUX Itanium 64-bit ! # $ARCHITECTURE = "hppa64": # HPUX PA-RISC 64-bit ! # $ARCHITECTURE = "lx64": # Linux 64-bit ! # $ARCHITECTURE = "aixp64": # AIX 64-bit ! # $ARCHITECTURE = "solsp64": # Solaris 64-bit ! ! ! # STEP 4 -> Choose whether or not to enable encryption # # 0 -> No encryption library linking *************** *** 65,69 **** ! # STEP 4 -> Some additional compilation options # # Change this only if you have good reason to do so. --- 76,80 ---- ! # STEP 5 -> Some additional compilation options # # Change this only if you have good reason to do so. *************** *** 114,118 **** $AUTODEFINES = " -D_WIN32 " if($WINDOWS); $AUTODEFINES .= " -Wno-unused-variable -Wuninitialized " if $Config{'cc'} eq "gcc"; ! $AUTODEFINES .= " -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS " if $WINDOWS && $ENV{ARSPERLTEST_PARAM}; $AUTODEFINES .= " -DARSPERL_UNDEF_MALLOC " if $ADVANCED_CONFIG{UNDEF_PERL_MALLOC}; --- 125,129 ---- $AUTODEFINES = " -D_WIN32 " if($WINDOWS); $AUTODEFINES .= " -Wno-unused-variable -Wuninitialized " if $Config{'cc'} eq "gcc"; ! $AUTODEFINES .= " -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS " if $WINDOWS && $ENV{ARSPERLTEST_PARAM}; $AUTODEFINES .= " -DARSPERL_UNDEF_MALLOC " if $ADVANCED_CONFIG{UNDEF_PERL_MALLOC}; *************** *** 129,140 **** } if ($ARSVERSION >= 6.3) { ! $ARS_STATIC_LIB = "$ARSAPI/lib/libar.a"; ! $ARS_STATIC_LIB = "$ARSAPI/lib/libar.a $ARSAPI/libarencrypt.a" if $ENCRYPT; $ARS_LIBS = " -lnsl "; }else{ ! $ARS_LIBS = " -lar -lnsl "; ! $ARS_LIBS = " -lar -larencrypt -lnsl " if $ENCRYPT; } #$PM->{'ARS/artypes.ph'} = '$(INST_LIBDIR)/ARS/artypes.ph' if $ARSVERSION >= 6.3; --- 140,153 ---- } + $LARCH = $ARCHITECTURE ? "_".$ARCHITECTURE : ""; + if ($ARSVERSION >= 6.3) { ! $ARS_STATIC_LIB = "$ARSAPI/lib/libar$LARCH.a"; ! $ARS_STATIC_LIB = "$ARSAPI/lib/libar$LARCH.a $ARSAPI/libarencrypt$LARCH.a" if $ENCRYPT; $ARS_LIBS = " -lnsl "; }else{ ! $ARS_LIBS = " -lar$LARCH -lnsl "; ! $ARS_LIBS = " -lar$LARCH -larencrypt$LARCH -lnsl " if $ENCRYPT; } #$PM->{'ARS/artypes.ph'} = '$(INST_LIBDIR)/ARS/artypes.ph' if $ARSVERSION >= 6.3; *************** *** 145,152 **** } else { $ARS_LIBS .= " -lpthread "; ! $ARS_LIBS .= " -licuucbmc -licui18nbmc -libicudatabmc " if $ARSVERSION >= 7.0; } $AUTODEFINES .= " -DARS32 -DARS452 "; ! if ( ($ARSVERSION >= 5.0) && ($^O eq 'linux') ) { $AUTODEFINES .= " -malign-double "; } --- 158,165 ---- } else { $ARS_LIBS .= " -lpthread "; ! $ARS_LIBS .= " -licuucbmc$LARCH -licui18nbmc$LARCH -licudatabmc$LARCH " if $ARSVERSION >= 7.0; } $AUTODEFINES .= " -DARS32 -DARS452 "; ! if( ($ARSVERSION >= 5.0) && ($^O eq 'linux') && $LARCH !~ /64/ ){ $AUTODEFINES .= " -malign-double "; } *************** *** 239,246 **** } ! unlink ('ARS/_h2ph_pre.ph'); ! open (FD, "> ARS/_h2ph_pre.ph") || die "open: $!"; ! print FD "1;\n"; ! close(FD); if((! -e "ARS/${_}-h.pm") || (-z "ARS/${_}-h.pm")) { --- 252,259 ---- } ! # unlink ('ARS/_h2ph_pre.ph'); ! # open (FD, "> ARS/_h2ph_pre.ph") || die "open: $!"; ! # print FD "1;\n"; ! # close(FD); if((! -e "ARS/${_}-h.pm") || (-z "ARS/${_}-h.pm")) { *************** *** 319,323 **** 'realclean' => { ! 'FILES' => 'support.h ARS/ar-h.pm ARS/arerrno-h.pm ARS/_h2ph_pre.ph t/config.cache serverTypeInfoHints.h *~ .purify ' } ); --- 332,336 ---- 'realclean' => { ! 'FILES' => 'support.h ARS/ar-h.pm ARS/arerrno-h.pm ARS/_h2ph_pre.ph t/config.cache serverTypeInfoHints.h *~ .purify ' } ); Index: StructDef.pl =================================================================== RCS file: /cvsroot/arsperl/ARSperl/StructDef.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StructDef.pl 2 Apr 2009 18:57:03 -0000 1.8 --- StructDef.pl 14 Apr 2009 16:58:24 -0000 1.9 *************** *** 2163,2166 **** --- 2163,2167 ---- ARMultiSchemaSortList => { + _min_version => '7.5.0', _num => 'p->numItems', _list => 'p->listPtr', *************** *** 2168,2171 **** --- 2169,2173 ---- }, ARMultiSchemaSortStruct => { + _min_version => '7.5.0', fieldId => { _type => 'ARMultiSchemaFieldIdStruct', |
