change to signtool

git-svn-id: svn://10.0.0.236/branches/Dialup_406RTM_BRANCH@13168 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/cmd/dialup/as_html/makefile.win

@@ -17,27 +17,21 @@ DEPTH=..\..\..
 DIRS=metadata
 
 PACKAGE=netscape\asw
-SIGNDIR=signed
 
 !include <$(DEPTH)\config\rules.mak>
 
-export:: $(JAVA_DESTPATH)\$(PACKAGE)
+export::
 	-rm compare.js
-	-mkdir $(SIGNDIR)\$(PACKAGE)
-	echo copying html
-	copy *.htm $(SIGNDIR) 
-	echo copying js
-	copy *.js $(SIGNDIR)
-	echo copy class files
-	copy $(JAVA_DESTPATH)\$(PACKAGE)\*.class $(SIGNDIR)\$(PACKAGE)
+	-rm compare.htm
+	-rm ispplans.htm
+	-rm -rf asw.arc
+	-rm asw.jar
 
 install:: $(JAVA_DESTPATH)\$(PACKAGE)
-	-rm $(SIGNDIR)\compare.htm
-	-rm $(SIGNDIR)\ispplans.htm
-	-rm -rf $(SIGNDIR)\asw.arc
-	cd $(SIGNDIR) 
-#	signtool \
-	$(PERL) $(DEPTH)\..\security\cmd\jar\signPages.pl \
+	-mkdir $(PACKAGE)
+	-copy $(JAVA_DESTPATH)\$(PACKAGE)\*.class $(PACKAGE)
+	$(ZIP) asw.jar netscape\asw\*.class
+	signtool \
 !ifdef MOZ_CERT_DIR
 	-d $(MOZ_CERT_DIR) \
 !endif
@@ -47,10 +41,12 @@ install:: $(JAVA_DESTPATH)\$(PACKAGE)
 !ifdef MOZ_CERT_PWD
 	-p $(MOZ_CERT_PWD) \
 !endif
-#	-J .
-	*.htm
-	$(ZIP) asw.jar *
-
+	-x"config" -x"Cvs" -x"help" -x"images" -x"intro" \
+	-x"metadata" -x"signed" \
+	-J .
 clobber::
-	-rm -rf $(JAVA_DESTPATH)\$(PACKAGE)
-	-rm -rf $(SIGNDIR)
+	-rm compare.js
+	-rm compare.htm
+	-rm ispplans.htm
+	-rm -rf asw.arc
+

mozilla/cmd/dialup/java/makefile.win

@@ -17,15 +17,17 @@ DEPTH=..\..\..
 DIRS=plugin applet
 
 PACKAGE=netscape\npasw
-SIGNDIR=signed
 
 !include <$(DEPTH)\config\rules.mak>
 
-
+export::
+	-rm npasw.jar
+	-rm -rf signed
+	-mkdir signed\$(PACKAGE)
+	-copy $(JAVA_DESTPATH)\$(PACKAGE)\*.* signed\$(PACKAGE)
+	
 install:: $(JAVA_DESTPATH)\$(PACKAGE)
-	-mkdir $(SIGNDIR)\$(PACKAGE)
-	copy $(JAVA_DESTPATH)\$(PACKAGE)\*.class $(SIGNDIR)\$(PACKAGE)
-	zigbert \
+	signtool \
 !ifdef MOZ_CERT_DIR
 	-d $(MOZ_CERT_DIR) \
 !endif
@@ -35,9 +37,8 @@ install:: $(JAVA_DESTPATH)\$(PACKAGE)
 !ifdef MOZ_CERT_PWD
 	-p $(MOZ_CERT_PWD) \
 !endif
-	$(SIGNDIR)
-	cd $(SIGNDIR)
-	$(ZIP) npasw.jar *
-
+	-Z"npasw.jar" \
+	signed
+	
 clobber::
-	-rm -r $(SIGNDIR)
+	-rm npasw.jar

mozilla/cmd/dialup/makefile.win

@@ -30,19 +30,11 @@ install::
 		$(DEPTH)\dist\$(OBJDIR)\lib\np32asw.dll \
 		$(BUILD_INSTALL_DIR)\plugins
 	$(MAKE_INSTALL) \
-		java\signed\npasw.jar \
+		java\npasw.jar \
 		$(BUILD_INSTALL_DIR)\plugins
 	$(MAKE_INSTALL) \
-		as_html\signed\asw.jar \
+		as_html\asw.jar \
 		$(BUILD_INSTALL_DIR)\asw
-#	$(MAKE_INSTALL) \
-#		as_html\metadata\html\compare.js \
-#		as_html
-!ifdef ASW_DEVMODE
-	$(MAKE_INSTALL) \
-		as_html\signed\asw.jar \
-		as_html
-!endif
 !ifdef MOZ_INSTALL_DIR
 	echo copying plugin to Communicator folder...
 	copy \
@@ -50,10 +42,10 @@ install::
 		$(MOZ_INSTALL_DIR)\Program\Plugins\.
 	echo copying plugin .jar to Commuicator folder...
 	copy \
-		java\signed\npasw.jar \
+		java\npasw.jar \
 		$(MOZ_INSTALL_DIR)\Program\Plugins\.
 	echo copying plugin .jar to Commuicator folder...
 	copy \
-		as_html\signed\asw.jar \
+		as_html\asw.jar \
 		$(MOZ_INSTALL_DIR)\Program\ASW\.
 !endif