OpenJDK / jdk7u / jdk7u-dev / jdk
changeset 5042:bb8d00b9c06e
7172552: jabswitch utility should not request elevated privilege on the system
Reviewed-by: ptbrunet
| author | raginip |
|---|---|
| date | Wed, 30 May 2012 14:02:06 -0700 |
| parents | e15839c985d1 |
| children | bd2b4dbc3134 |
| files | make/bridge/Jabswitch/Makefile |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bridge/Jabswitch/Makefile Fri May 18 14:22:43 2012 -0700 +++ b/make/bridge/Jabswitch/Makefile Wed May 30 14:02:06 2012 -0700 @@ -35,6 +35,7 @@ CPLUSPLUSLIBRARY=true VERSIONINFO_RESOURCE = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/AccessBridgeStatusWindow.rc +VERSIONRES = $(TEMPDIR)/AccessBridgeStatusWindow.res JAB_EXE= $(TEMPDIR)/jabswitch.exe @@ -43,15 +44,16 @@ JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest -RC_FLAGS += -d "JAB_MANIFEST_EMBED=$(JAB_MANIFEST_EMBED)" -OTHER_CPPFLAGS += /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" -LDDFLAGS +=/manifest /ManifestFile:$(JAB_MANIFEST_INP) /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" +RC_FLAGS += /fo "$(VERSIONRES)" +OTHER_CPPFLAGS += /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /MDd /Gm /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc +LDDFLAGS += Advapi32.lib Version.lib User32.lib all: buildexe copyfilejab buildexe : $(CD) $(TEMPDIR) - $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) -o $(JAB_EXE) + $(RC) $(RC_FLAGS) $(VERSIONINFO_RESOURCE) + $(CC) $(CPPFLAGS) $(JAB_SRC) $(LDDFLAGS) $(VERSIONRES) -o $(JAB_EXE) $(MT) /nologo /verbose /manifest $(JAB_MANIFEST_INP) /outputresource:$(JAB_EXE) copyfilejab :