From 6dc37259b8628525fcee1a1ac2dcd55b33370993 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Tue, 19 Aug 2003 20:08:33 +0000
Subject: [PATCH] Bugzilla bug 216693: running make in mozilla/security/jss
 should build the class jar file. Modified Files: rules.mk build_java.pl

---
 security/jss/build_java.pl | 4 ++++
 security/jss/rules.mk      | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/security/jss/build_java.pl b/security/jss/build_java.pl
index 7175bc3f352..c4e786dcf33 100644
--- a/security/jss/build_java.pl
+++ b/security/jss/build_java.pl
@@ -125,11 +125,13 @@ sub setup_vars {
     $class_release_dir = $cmdline_vars{SOURCE_RELEASE_PREFIX};
     if( $ENV{BUILD_OPT} ) {
         $class_dir = "$dist_dir/classes";
+        $class_jar = "$dist_dir/$cmdline_vars{XPCLASS_JAR}";
         $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DIR}";
         $javac_opt_flag = "-O";
         $debug_source_file = "org/mozilla/jss/util/Debug_ship.jnot";
     } else {
         $class_dir = "$dist_dir/classes_DBG";
+        $class_jar = "$dist_dir/$cmdline_vars{XPCLASS_DBG_JAR}";
         $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DBG_DIR}";
         $javac_opt_flag = "-g";
         $debug_source_file = "org/mozilla/jss/util/Debug_debug.jnot";
@@ -143,6 +145,7 @@ sub setup_vars {
 
 sub clean {
     print_do("rm -rf $class_dir");
+    print_do("rm -f $class_jar");
     print_do("rm -rf $jni_header_dir");
 }
 
@@ -192,6 +195,7 @@ sub build {
         ensure_dir_exists($class_dir);
         print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
             "$classpath " . join(" ",@source_list));
+        print_do("cd $class_dir; rm -f $class_jar; zip -r $class_jar org");
     }
 
     #
diff --git a/security/jss/rules.mk b/security/jss/rules.mk
index 74af043d869..6ebba854d4d 100644
--- a/security/jss/rules.mk
+++ b/security/jss/rules.mk
@@ -12,7 +12,9 @@ PERL_VARIABLES=     \
     "SOURCE_PREFIX=$(SOURCE_PREFIX)" \
     "SOURCE_RELEASE_PREFIX=$(SOURCE_RELEASE_PREFIX)" \
     "SOURCE_RELEASE_CLASSES_DBG_DIR=$(SOURCE_RELEASE_CLASSES_DBG_DIR)" \
-    "SOURCE_RELEASE_CLASSES_DIR=$(SOURCE_RELEASE_CLASSES_DIR)"
+    "SOURCE_RELEASE_CLASSES_DIR=$(SOURCE_RELEASE_CLASSES_DIR)" \
+    "XPCLASS_DBG_JAR=$(XPCLASS_DBG_JAR)" \
+    "XPCLASS_JAR=$(XPCLASS_JAR)"
 
 buildJava:
 	perl build_java.pl $(PERL_VARIABLES) build