From 8fd70000457b9c8716ba0423c437b6a7b6c5bfb7 Mon Sep 17 00:00:00 2001 From: "nicolson%netscape.com" Date: Mon, 28 Jan 2002 23:08:16 +0000 Subject: [PATCH] make release_classes target work. git-svn-id: svn://10.0.0.236/trunk@113057 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/jss/build_java.pl | 7 ++++++- mozilla/security/jss/rules.mk | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mozilla/security/jss/build_java.pl b/mozilla/security/jss/build_java.pl index 416ca979a21..2e7a0990d23 100644 --- a/mozilla/security/jss/build_java.pl +++ b/mozilla/security/jss/build_java.pl @@ -97,12 +97,15 @@ sub setup_vars { $dist_dir = $cmdline_vars{SOURCE_PREFIX}; + $class_release_dir = $cmdline_vars{SOURCE_RELEASE_PREFIX}; if( $ENV{BUILD_OPT} ) { $class_dir = "$dist_dir/classes"; + $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DIR}"; $javac_opt_flag = "-O"; $debug_source_file = "org/mozilla/jss/util/Debug_ship.java"; } else { $class_dir = "$dist_dir/classes_DBG"; + $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DBG_DIR}"; $javac_opt_flag = "-g"; $debug_source_file = "org/mozilla/jss/util/Debug_debug.java"; } @@ -236,5 +239,7 @@ sub ensure_dir_exists { } sub release { - print "Arguments: " . join(",", @_) . "\n"; + # copy all class files into release directory + ensure_dir_exists("$class_release_dir"); + print_do("cp -r $class_dir/* $class_release_dir"); } diff --git a/mozilla/security/jss/rules.mk b/mozilla/security/jss/rules.mk index e2442bb01a5..df704c28eaf 100644 --- a/mozilla/security/jss/rules.mk +++ b/mozilla/security/jss/rules.mk @@ -3,11 +3,19 @@ .PHONY: releaseJava clean:: cleanJava +release_classes:: releaseJava -PERL_VARIABLES="SOURCE_PREFIX=$(SOURCE_PREFIX)" +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)" buildJava: perl build_java.pl $(PERL_VARIABLES) build cleanJava: perl build_java.pl $(PERL_VARIABLES) clean + +releaseJava: + perl build_java.pl $(PERL_VARIABLES) release