diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-05-16 03:10:15 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-05-16 03:10:15 +0000 |
| commit | 582a2c5f1fe8801c22a076ad1d8128d8f82fc4c9 (patch) | |
| tree | 5f872acdf8c251416098705004ae93e8ac60476c | |
| parent | 86623b54b34d2b3fd4e30d1973426481d918eea1 (diff) | |
| download | ds-582a2c5f1fe8801c22a076ad1d8128d8f82fc4c9.tar.gz ds-582a2c5f1fe8801c22a076ad1d8128d8f82fc4c9.tar.xz ds-582a2c5f1fe8801c22a076ad1d8128d8f82fc4c9.zip | |
Bug(s) fixed: 157341
Bug Description: Tracking bug for the windows synch service
Reviewed by: no one (but it should be pretty safe)
Fix Description: Thomas and Anthony already did most of the work require to build the windows sync packages and push them as components. This change just picks up those two components and packages them with the DS build. When DS is installed, there will be a new "winsync" directory under the server root. This directory contains self extracting Windows installer files for Active Directory sync and NT4 sync, with a .msi extension. The user will have to copy these files to the Windows machine containing the domain controller.
Platforms tested: RHEL3
Flag Day: no
Doc impact: Yes. The Windows Sync documentation will have to explain where these files reside in the package and how to install them.
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | component_versions.mk | 8 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 67 |
3 files changed, 76 insertions, 1 deletions
@@ -132,7 +132,7 @@ help: ifeq ($(INTERNAL_BUILD), 1) COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \ $(ICU_DEP) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \ - $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) + $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) endif # Pull WiX MSI toolkit on Windows. diff --git a/component_versions.mk b/component_versions.mk index a81de94e..e74e37b4 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -248,3 +248,11 @@ endif ifndef MAVEN_VERSION MAVEN_VERSION=1.0.2 endif + +ifndef ADSYNC_VERSION + ADSYNC_VERSION=20050513 +endif + +ifndef NT4SYNC_VERSION + NT4SYNC_VERSION=20050513 +endif diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 3861ac3b..d180322f 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -774,3 +774,70 @@ $(DSDOC_DEP): $(NSCP_DISTDIR) exit 1 ; \ fi ### DOCS END ############################# + + +# Windows sync component for Active Directory +ADSYNC = PassSync-$(BUILD_DEBUG).msi +ADSYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync +ADSYNC_FILE = $(ADSYNC_DEST)/$(ADSYNC) +ADSYNC_FILES = $(ADSYNC) +ADSYNC_RELEASE = $(COMPONENTS_DIR)/winsync/passsync +# windows make naming convention - release = optimize, debug = full +ifeq ($(BUILD_DEBUG), optimize) + ADSYNC_DIR_SUFFIX=release +else + ADSYNC_DIR_SUFFIX=debug +endif +ADSYNC_DIR = $(ADSYNC_RELEASE)/$(ADSYNC_VERSION)/$(ADSYNC_DIR_SUFFIX) + +ADSYNC_DEP = $(ADSYNC_FILE) +PACKAGE_SRC_DEST += $(ADSYNC_FILE) winsync + +ifndef ADSYNC_PULL_METHOD +ADSYNC_PULL_METHOD = $(COMPONENT_PULL_METHOD) +endif + +$(ADSYNC_DEP): $(NSCP_DISTDIR_FULL_RTL) +ifdef COMPONENT_DEPS + echo "Inside ftppull" + $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \ + -objdir $(ADSYNC_DEST) -componentdir $(ADSYNC_DIR) \ + -files $(ADSYNC_FILES) +endif + -@if [ ! -f $@ ] ; \ + then echo "Error: could not get component ADSYNC files $@" ; \ + fi +# Windows sync component for Active Directory + +# Windows sync component for NT4 +NT4SYNC = ntds-$(BUILD_DEBUG).msi +NT4SYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync +NT4SYNC_FILE = $(NT4SYNC_DEST)/$(NT4SYNC) +NT4SYNC_FILES = $(NT4SYNC) +NT4SYNC_RELEASE = $(COMPONENTS_DIR)/winsync/ntds +# windows make naming convention - release = optimize, debug = full +ifeq ($(BUILD_DEBUG), optimize) + NT4SYNC_DIR_SUFFIX=release +else + NT4SYNC_DIR_SUFFIX=debug +endif +NT4SYNC_DIR = $(NT4SYNC_RELEASE)/$(NT4SYNC_VERSION)/$(NT4SYNC_DIR_SUFFIX) + +NT4SYNC_DEP = $(NT4SYNC_FILE) +PACKAGE_SRC_DEST += $(NT4SYNC_FILE) winsync + +ifndef NT4SYNC_PULL_METHOD +NT4SYNC_PULL_METHOD = $(COMPONENT_PULL_METHOD) +endif + +$(NT4SYNC_DEP): $(NSCP_DISTDIR_FULL_RTL) +ifdef COMPONENT_DEPS + echo "Inside ftppull" + $(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \ + -objdir $(NT4SYNC_DEST) -componentdir $(NT4SYNC_DIR) \ + -files $(NT4SYNC_FILES) +endif + -@if [ ! -f $@ ] ; \ + then echo "Error: could not get component NT4SYNC files $@" ; \ + fi +# Windows sync component for NT4 |