apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661742 - in /apr/apr-util/branches/1.3.x: Makefile.win aprutil.dsw ldap/apr_ldap.dsp libaprutil.rc test/testall.dsw
Date Fri, 30 May 2008 14:48:09 GMT
Author: wrowe
Date: Fri May 30 07:48:08 2008
New Revision: 661742

URL: http://svn.apache.org/viewvc?rev=661742&view=rev
Log:
Plug in loadable ldap build for win32

Backport: r661740

Added:
    apr/apr-util/branches/1.3.x/ldap/apr_ldap.dsp
      - copied unchanged from r661741, apr/apr-util/trunk/ldap/apr_ldap.dsp
Modified:
    apr/apr-util/branches/1.3.x/Makefile.win
    apr/apr-util/branches/1.3.x/aprutil.dsw
    apr/apr-util/branches/1.3.x/libaprutil.rc
    apr/apr-util/branches/1.3.x/test/testall.dsw

Modified: apr/apr-util/branches/1.3.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/Makefile.win?rev=661742&r1=661741&r2=661742&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/Makefile.win (original)
+++ apr/apr-util/branches/1.3.x/Makefile.win Fri May 30 07:48:08 2008
@@ -188,10 +188,14 @@
 	cd ..\..\..
 	 $(MAKE) $(MAKEOPT) -f aprutil.mak     CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libaprutil.mak  CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ldap
+	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_ldap
 	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil
 	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
 	cd $(API_PATH)
@@ -210,11 +214,13 @@
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libapr_app
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil
+	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
+	-msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" /CLEAN
 	-msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN
 	-msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN
 	cd $(API_PATH)
@@ -233,6 +239,7 @@
 	@msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)"
 
 !ENDIF
 
@@ -287,6 +294,8 @@
 	copy $(API_PATH)\$(ARCHPATH)\libapriconv-1.pdb	"$(PREFIX)\bin\" <.y
 	copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.dll	"$(PREFIX)\bin\" <.y
 	copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.pdb	"$(PREFIX)\bin\" <.y
+	copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.dll "$(PREFIX)\bin\" <.y
+	copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so  "$(PREFIX)\bin\iconv\" /d < .a
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a
 !IFDEF OPENSSL_DIR

Modified: apr/apr-util/branches/1.3.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/aprutil.dsw?rev=661742&r1=661741&r2=661742&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.3.x/aprutil.dsw Fri May 30 07:48:08 2008
@@ -30,6 +30,24 @@
 
 ###############################################################################
 
+Project: "apr_ldap"=".\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>

Modified: apr/apr-util/branches/1.3.x/libaprutil.rc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/libaprutil.rc?rev=661742&r1=661741&r2=661742&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/libaprutil.rc (original)
+++ apr/apr-util/branches/1.3.x/libaprutil.rc Fri May 30 07:48:08 2008
@@ -17,8 +17,13 @@
   "See the License for the specific language governing permissions and " \
   "limitations under the License."
 
+#ifdef DLL_NAME
+#define APU_DLL_BASENAME APU_STRINGIFY(DLL_NAME) "-" APU_STRINGIFY(APU_MAJOR_VERSION)
+#define APU_DLL_DESCRIPTION "Apache Portable Runtime " APU_STRINGIFY(DLL_NAME) " Module"
+#else
 #define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
-
+#define APU_DLL_DESCRIPTION "Apache Portable Runtime Utility Library"
+#endif
 
 1 VERSIONINFO
  FILEVERSION APU_VERSION_STRING_CSV,0
@@ -51,7 +56,7 @@
     BEGIN
     VALUE "Comments", APU_LICENSE "\0"
       VALUE "CompanyName", "Apache Software Foundation\0"
-      VALUE "FileDescription", "Apache Portable Runtime Library\0"
+      VALUE "FileDescription", APU_DLL_DESCRIPTION "\0"
       VALUE "FileVersion", APU_VERSION_STRING "\0"
       VALUE "InternalName", APU_DLL_BASENAME "\0"
       VALUE "LegalCopyright", APU_COPYRIGHT "\0"

Modified: apr/apr-util/branches/1.3.x/test/testall.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testall.dsw?rev=661742&r1=661741&r2=661742&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testall.dsw (original)
+++ apr/apr-util/branches/1.3.x/test/testall.dsw Fri May 30 07:48:08 2008
@@ -30,6 +30,24 @@
 
 ###############################################################################
 
+Project: "apr_ldap"="..\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -213,6 +231,9 @@
 Package=<4>
 {{{
     Begin Project Dependency
+    Project_Dep_Name apr_ldap
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency



Mime
View raw message