From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25134 invoked by alias); 18 Jan 2008 04:37:47 -0000 Received: (qmail 25109 invoked by uid 367); 18 Jan 2008 04:37:46 -0000 Date: Fri, 18 Jan 2008 04:37:00 -0000 Message-ID: <20080118043746.25094.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Keep the contents of the .jar file ordered. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4a5a9f45ef25a717ed2e7c5b03d96a972f3ee393 X-Git-Newrev: 8f9300fae4dc499d712ded780297e7eac0849485 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00089.txt.bz2 The branch, master has been updated via 8f9300fae4dc499d712ded780297e7eac0849485 (commit) from 4a5a9f45ef25a717ed2e7c5b03d96a972f3ee393 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 8f9300fae4dc499d712ded780297e7eac0849485 Author: Andrew Cagney Date: Thu Jan 17 17:41:47 2008 -0500 Keep the contents of the .jar file ordered. frysk-common/ChangeLog 2008-01-17 Andrew Cagney * Makefile.rules (.jar): Sort the .class file list. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 4 ++++ frysk-common/Makefile.rules | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 74f85b9..acce967 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,7 @@ +2008-01-17 Andrew Cagney + + * Makefile.rules (.jar): Sort the .class file list. + 2008-01-08 Andrew Cagney * Makefile.rules (distclean-cvsignored): Add dependency on diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules index af9d0c1..2087b81 100644 --- a/frysk-common/Makefile.rules +++ b/frysk-common/Makefile.rules @@ -649,6 +649,10 @@ files-java.list: files.list else \ cp /dev/null $@ ; \ fi + +# Compile all the .java files to .class and then insert into a .jar. +# Sort the list to keep the contents stable. + ${GEN_DIRNAME}.jar: files-java.list $(GEN_CLASSPATH) rm -rf $(JAVAROOT) mkdir -p $(JAVAROOT) @@ -662,6 +666,7 @@ ${GEN_DIRNAME}.jar: files-java.list $(GEN_CLASSPATH) rm -f $*.log cd $(JAVAROOT) ; \ find * -name '*.class' -print \ + | sort \ | $(JAR) -@ -cf $@ mv $(JAVAROOT)/$@ $@ hooks/post-receive -- frysk system monitor/debugger