January 2011 - jbossnative-commits

JBoss Native SVN: r2714 - trunk/httpd/httpd-2.2/srclib/apr-util.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 06:50:40 -0500 (Tue, 11 Jan 2011) New Revision: 2714 Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu Log: Add proper expat flags Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-11 11:48:18 UTC (rev 2713) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-11 11:50:40 UTC (rev 2714) @@ -49,6 +49,7 @@ !ENDIF CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\" +FEXPAT = -DCOMPILED_FROM_DSP -DXML_STATIC !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" SRCDIR = . @@ -232,10 +233,10 @@ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $< $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2713 - trunk/srclib/apr-util.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 06:48:18 -0500 (Tue, 11 Jan 2011) New Revision: 2713 Modified: trunk/srclib/apr-util/NMAKEmakefile Log: Add proper expat flags and axe extra obj files Modified: trunk/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:56:39 UTC (rev 2712) +++ trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 11:48:18 UTC (rev 2713) @@ -41,6 +41,7 @@ !ENDIF CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\" +FEXPAT = -DCOMPILED_FROM_DSP -DXML_STATIC !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" SRCDIR = . @@ -97,9 +98,6 @@ $(WORKDIR)\sdbm_pair.obj \ $(WORKDIR)\apr_base64.obj \ $(WORKDIR)\apr_hooks.obj \ - $(WORKDIR)\apr_ldap_init.obj \ - $(WORKDIR)\apr_ldap_url.obj \ - $(WORKDIR)\apr_ldap_option.obj \ $(WORKDIR)\apr_date.obj \ $(WORKDIR)\apr_queue.obj \ $(WORKDIR)\apr_reslist.obj \ @@ -218,10 +216,10 @@ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $< $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2712 - trunk/srclib/apr-util.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 04:56:39 -0500 (Tue, 11 Jan 2011) New Revision: 2712 Modified: trunk/srclib/apr-util/NMAKEmakefile Log: Add missing memchace dir Modified: trunk/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:44:21 UTC (rev 2711) +++ trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:56:39 UTC (rev 2712) @@ -202,6 +202,9 @@ {$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< +{$(SRCDIR)\memcache}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + {$(SRCDIR)\misc}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2711 - trunk/srclib/apr-util.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 04:44:21 -0500 (Tue, 11 Jan 2011) New Revision: 2711 Modified: trunk/srclib/apr-util/NMAKEmakefile Log: Add apu 1.3 soures Modified: trunk/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:23:44 UTC (rev 2710) +++ trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:44:21 UTC (rev 2711) @@ -113,6 +113,35 @@ $(WORKDIR)\xmlrole.obj \ $(WORKDIR)\xmltok.obj +# Include APU 1.3 sources +!IF EXIST($(SRCDIR)\misc\apu_dso.c) +OBJECTS = $(OBJECTS) \ + $(WORKDIR)\apu_dso.obj \ + $(WORKDIR)\apr_thread_pool.obj \ + $(WORKDIR)\apr_memcache.obj + +!ENDIF + +!IF EXIST($(SRCDIR)\LDAP\apr_ldap_stub.c) +OBJECTS = $(OBJECTS) \ + $(WORKDIR)\apr_ldap_stub.obj \ + $(WORKDIR)\apr_ldap_url.obj + +!IF "$(TARGET)" == "LIB" +OBJECTS = $(OBJECTS) \ + $(WORKDIR)\apr_ldap_init.obj \ + $(WORKDIR)\apr_ldap_option.obj \ + $(WORKDIR)\apr_ldap_rebind.obj + +!ENDIF +!ELSE +OBJECTS = $(OBJECTS) \ + $(WORKDIR)\apr_ldap_init.obj \ + $(WORKDIR)\apr_ldap_option.obj \ + $(WORKDIR)\apr_ldap_url.obj + +!ENDIF + HEADERS = \ $(SRCDIR)\include\apu.h \ $(SRCDIR)\include\apu_want.h \

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2710 - in trunk: srclib/apr-util and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 04:23:44 -0500 (Tue, 11 Jan 2011) New Revision: 2710 Modified: trunk/build/unix/build.sh trunk/srclib/apr-util/NMAKEmakefile Log: Make standalone APU buildable as well Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2011-01-11 09:17:16 UTC (rev 2709) +++ trunk/build/unix/build.sh 2011-01-11 09:23:44 UTC (rev 2710) @@ -854,6 +854,7 @@ (cd ${apu_srcdir} cp -f include/apu.hw include/apu.h cp -f xml/expat/lib/winconfig.h xml/expat/lib/config.h + cp -f xml/expat/lib/winconfig.h xml/expat/lib/expat_config.h cp -f xml/expat/lib/expat.h.in xml/expat/lib/expat.h echo "Building APR utilities ${apu_version} ..." cygwinpath true WITH_APR=${apu_common_dir} PREFIX=${apu_common_dir} SRCDIR=`pwd` Modified: trunk/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:17:16 UTC (rev 2709) +++ trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:23:44 UTC (rev 2710) @@ -189,7 +189,7 @@ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $< $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2709 - trunk/httpd/httpd-2.2/srclib/apr-util.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2011-01-11 04:17:16 -0500 (Tue, 11 Jan 2011) New Revision: 2709 Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu Log: Fix newer expat builds on win32 Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-10 17:28:53 UTC (rev 2708) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-11 09:17:16 UTC (rev 2709) @@ -158,6 +158,7 @@ $(SRCDIR)\include\private\apu_config.h \ $(SRCDIR)\include\private\apu_select_dbm.h \ $(SRCDIR)\xml\expat\lib\config.h \ + $(SRCDIR)\xml\expat\lib\expat_config.h \ $(SRCDIR)\xml\expat\lib\expat.h !IF "$(TARGET)" == "DLL" @@ -188,6 +189,9 @@ $(SRCDIR)\xml\expat\lib\config.h : @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL +$(SRCDIR)\xml\expat\lib\expat_config.h : + @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL + {$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< @@ -231,7 +235,7 @@ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $< $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2708 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2011-01-10 12:28:53 -0500 (Mon, 10 Jan 2011) New Revision: 2708 Modified: trunk/build/unix/build.sh Log: Move the logic to find the gnu patch after setting the PATH... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2011-01-10 11:33:27 UTC (rev 2707) +++ trunk/build/unix/build.sh 2011-01-10 17:28:53 UTC (rev 2708) @@ -170,14 +170,6 @@ export build_version export PACKAGE -# Check for some gnu mandadory tools. -patch=`util/find_gnu.sh patch` -if [ "x" = "x${patch}" ]; then - echo "Error missing gnu patch command" - exit 1 -fi -export patch - # Read tag and version of subcomponent/dependencies. parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep "|$build_version|" | sed 's:|: :g'` @@ -393,6 +385,16 @@ ;; esac +# Check for some gnu mandadory tools. +# patch. +patch=`util/find_gnu.sh patch` +if [ "x" = "x${patch}" ]; then + echo "Error missing gnu patch command" + exit 1 +fi +export patch + + # Check for a posix tar mkdir test.$$ tar --owner=root --group=bin -cf /dev/null test.$$

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2707 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2011-01-10 06:33:27 -0500 (Mon, 10 Jan 2011) New Revision: 2707 Modified: trunk/build/unix/build.sh Log: Add /opt/freeware for the AIX boxes. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2011-01-06 11:26:31 UTC (rev 2706) +++ trunk/build/unix/build.sh 2011-01-10 11:33:27 UTC (rev 2707) @@ -387,6 +387,10 @@ build_zlib=true fi ;; + AIX) + PATH=$PATH:/opt/freeware/bin + export PATH + ;; esac # Check for a posix tar

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2706 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

13 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2705 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits January 2011