Преглед изворни кода

Remove un-needed Console SDK dependency

Nathan Kinder пре 20 година
родитељ
комит
94662ccfb4
3 измењених фајлова са 1 додато и 48 уклоњено
  1. 1 1
      Makefile
  2. 0 11
      component_versions.mk
  3. 0 36
      internal_comp_deps.mk

+ 1 - 1
Makefile

@@ -107,7 +107,7 @@ components: $(COMPONENT_DEPENDENCIES)
 	-@echo "The components are up to date"
 
 ifeq ($(BUILD_JAVA_CODE),1)
-DS_CONSOLE_COMPONENT_DEP  = $(LDAPJDK_DEP) $(SWING_DEP) $(MCC_DEP) $(LDAPCONSOLE_DEP)
+DS_CONSOLE_COMPONENT_DEP  = $(LDAPJDK_DEP) $(LDAPCONSOLE_DEP)
 DS_CONSOLE_COMPONENT_DEP += $(JAVASSL_DEP) $(JSS_DEP) $(CRIMSONJAR_DEP)
 java_platform_check:
 

+ 0 - 11
component_versions.mk

@@ -131,17 +131,6 @@ ifndef ADMINUTIL_VERSDIR
   ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)
 endif
 
-# MCC (Console JDK)
-ifndef MCC_REL
-  MCC_REL=62
-endif
-ifndef MCC_COMP
-  MCC_COMP = consolesdk$(MCC_REL)
-endif
-ifndef MCC_RELDATE
-  MCC_RELDATE=20041117
-endif
-
 # LDAP Console
 ifndef LDAPCONSOLE_REL
   LDAPCONSOLE_REL=71

+ 0 - 36
internal_comp_deps.mk

@@ -525,42 +525,6 @@ endif
 	then echo "Error: could not get component LDAPJDK file $@" ; \
 	fi
 
-###########################################################
-
-# MCC java classes - the Mission Control Console #########
-MCC_VERSION=$(MCC_RELDATE)$(SEC_SUFFIX)
-#
-MCCJAR = mcc$(MCC_REL).jar
-MCCJAR_EN = mcc$(MCC_REL)_en.jar
-NMCLFJAR = nmclf$(MCC_REL).jar
-NMCLFJAR_EN = nmclf$(MCC_REL)_en.jar
-BASEJAR = base.jar
-#MCC_RELEASE=$(COMPONENTS_DIR_DEV)
-MCC_RELEASE=$(COMPONENTS_DIR)
-MCC_JARDIR = $(MCC_RELEASE)/$(MCC_COMP)/$(MCC_VERSION)/jars
-MCCJARFILE=$(CLASS_DEST)/$(MCCJAR)
-NMCLFJARFILE=$(CLASS_DEST)/$(NMCLFJAR)
-BASEJARFILE=$(CLASS_DEST)/$(BASEJAR)
-
-MCC_DEP = $(BASEJARFILE)
-MCC_FILES=$(MCCJAR),$(MCCJAR_EN),$(NMCLFJAR),$(NMCLFJAR_EN),$(BASEJAR)
-
-#PACKAGE_UNDER_JAVA += $(addprefix $(CLASS_DEST)/,$(subst $(COMMA),$(SPACE),$(MCC_FILES)))
-
-ifndef MCC_PULL_METHOD
-MCC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(MCC_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(MCC_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(MCC_JARDIR) \
-		-files $(MCC_FILES)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component MCC file $@" ; \
-	fi
-
 ###########################################################
 # LDAP Console java classes
 ###########################################################