mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
clean up clean up rules (use GARBAGE exclusively), update copyright year,
remove diagnostics module use. code from asasaki, r=leaf
This commit is contained in:
parent
bd64a22806
commit
ea650035b4
@ -14,8 +14,8 @@
|
||||
#
|
||||
# The Original Code is the Win32 Version System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Aki Sasaki <asasaki@netscape.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# The Initial Developer of the Original Code is Netscape Communications Corporation
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
|
@ -13,8 +13,8 @@
|
||||
#
|
||||
# The Original Code is the Win32 Version System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Aki Sasaki <asasaki@netscape.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# The Initial Developer of the Original Code is Netscape Communications Corporation
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
@ -40,17 +40,12 @@ CONFIG_RESFILE_INC=1
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#// Build .rc and .res files if $(RESFILE) isn't defined.
|
||||
#// PBI : ??
|
||||
#// DEBUG : $(MOZ_DEBUG)
|
||||
#// OFFICIAL : $(MOZILLA_OFFICIAL)
|
||||
#// MSTONE : grabs automagically
|
||||
#// OBJDIR : $(OBJDIR)
|
||||
#// MODNAME : $(MODULE)
|
||||
#// DEPTH : $(DEPTH)
|
||||
#// BINARY : ??
|
||||
#// BITS : $(MOZ_BITS)
|
||||
#// RCINCLUDE: ??
|
||||
#// QUIET : 1
|
||||
#// TODO:
|
||||
#// PBI : Private build info. Not used currently.
|
||||
#// Guessing the best way would be to set an env var.
|
||||
#// BINARY : Binary name. Not used currently.
|
||||
#// RCINCLUDE: Another .rc file to merge with the built .rc file.
|
||||
#// Not used currently.
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
_RC_STRING = -OBJDIR $(OBJDIR) -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -BITS $(MOZ_BITS) -QUIET 1 -SRCDIR .
|
||||
@ -65,20 +60,19 @@ _RC_STRING = $(_RC_STRING) -MODNAME $(MODULE)
|
||||
!endif
|
||||
|
||||
RESFILE=$(OBJDIR)\module.res
|
||||
RCFILE=$(OBJDIR)\module.rc
|
||||
|
||||
GARBAGE = $(GARBAGE) $(RESFILE) $(RCFILE)
|
||||
|
||||
# Dummy target so $(RESFILE) doesn't become the default
|
||||
all::
|
||||
|
||||
$(RESFILE):: $(OBJDIR)\module.rc
|
||||
$(RESFILE):: $(RCFILE)
|
||||
|
||||
$(OBJDIR)\module.rc:
|
||||
$(RCFILE):
|
||||
echo $(PERL) $(DEPTH)\config\version_win.pl $(_RC_STRING)
|
||||
$(PERL) $(DEPTH)\config\version_win.pl $(_RC_STRING)
|
||||
$(RC) $(OBJDIR)\module.rc
|
||||
|
||||
clobber_resfile:
|
||||
-rm -f $(RESFILE) $(OBJDIR)\module.rc
|
||||
|
||||
clobber:: clobber_resfile
|
||||
|
||||
!endif
|
||||
!endif # !CONFIG_RESFILE_INC
|
||||
|
@ -13,8 +13,8 @@
|
||||
#
|
||||
# The Original Code is the Win32 Version System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Aki Sasaki <asasaki@netscape.com>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# The Initial Developer of the Original Code is Netscape Communications Corporation
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
@ -41,9 +41,11 @@ INCLUDED_VERSION_MK=1
|
||||
# Windows gmake build:
|
||||
# Build default .rc file if $(RESFILE) isn't defined.
|
||||
# TODO:
|
||||
# PBI : ??
|
||||
# BINARY : ??
|
||||
# RCINCLUDE: ??
|
||||
# PBI : Private build info. Not used currently.
|
||||
# Guessing the best way would be to set an env var.
|
||||
# BINARY : Binary name. Not used currently.
|
||||
# RCINCLUDE: Another .rc file to merge with the built .rc file.
|
||||
# Not used currently.
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||
ifndef RESFILE
|
||||
RCFILE=./module.rc
|
||||
@ -61,14 +63,9 @@ endif
|
||||
|
||||
GARBAGE += $(RESFILE) $(RCFILE)
|
||||
|
||||
#dummy target so clean_resfile doesn't become the default =P
|
||||
#dummy target so $(RCFILE) doesn't become the default =P
|
||||
all::
|
||||
|
||||
clean_resfile:
|
||||
-rm -f $(RESFILE) $(RCFILE)
|
||||
|
||||
clean:: clean_resfile
|
||||
|
||||
$(RCFILE):
|
||||
$(PERL) $(topsrcdir)/config/version_win.pl $(_RC_STRING)
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
use diagnostics;
|
||||
#use diagnostics;
|
||||
require strict;
|
||||
use Getopt::Long;
|
||||
use Getopt::Std;
|
||||
|
Loading…
Reference in New Issue
Block a user