Kill Sun-specific stclient_wrapper

setup_native/prj/build.lst

@@ -18,5 +18,4 @@ pk  setup_native\source\win32\customactions\shellextensions nmake   -  w   sn_sh
 pk  setup_native\source\win32\customactions\indexingfilter nmake   -  w   sn_indexingfilter NULL
 pk  setup_native\source\win32\customactions\languagepacks nmake   -  w   sn_languagepacks sn_shellextensions.w sn_tools.w NULL
 pk  setup_native\source\win32\customactions\patch         nmake   -  w   sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL
-pk  setup_native\source\win32\stwrapper                   nmake   -  w   sn_stwrapper NULL
 pk  setup_native\source\ulfconv                           nmake   -  all sn_ulfconv NULL

setup_native/prj/d.lst

@@ -18,8 +18,6 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
 ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin%_EXT%\unpack_update
 ..\%__SRC%\bin\update.sh %_DEST%\bin%_EXT%\update
 ..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh
-..\%__SRC%\bin\stclient_wrapper.sh %_DEST%\bin%_EXT%\stclient_wrapper
-..\%__SRC%\bin\stclient_wrapper.exe %_DEST%\bin%_EXT%\stclient_wrapper.exe
 ..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf
 ..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt
 ..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt

setup_native/scripts/makefile.mk

@@ -46,10 +46,6 @@ UNIXTEXT= \
     $(BIN)$/update.sh \
     $(BIN)$/downloadscript.sh
 
-.IF "$(OS)" == "SOLARIS" || "$(OS)" == "LINUX"
-UNIXTEXT+= $(BIN)$/stclient_wrapper.sh
-.ENDIF
-
 NOARCH=$(BIN)$/noarch
 FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm
 FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root

setup_native/scripts/stclient_wrapper.sh

-#!/bin/sh
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-# All rights reserved.
-#
-
-if [ `uname -s` = "SunOS" ]; then
-  STCLIENT=/usr/bin/stclient
-else
-  STCLIENT=/opt/sun/servicetag/bin/stclient
-fi
-
-TARGET_URN=
-PRODUCT_NAME=
-PRODUCT_VERSION=
-PRODUCT_SOURCE=
-PARENT_PRODUCT_NAME=
-INSTANCE_URN=
-
-while [ $# -gt 0 ]
-do
-  case "$1" in
-    -t)  TARGET_URN="$2"; shift;;
-    -p)  PRODUCT_NAME="$2"; shift;;
-    -e)  PRODUCT_VERSION="$2"; shift;;
-    -i)  INSTANCE_URN="$2"; shift;;
-    -P)  PARENT_PRODUCT_NAME="$2"; shift;;
-    -S)  PRODUCT_SOURCE="$2"; shift;;
-    --)  shift; break;;
-    -*)
-        echo >&2 \
-        "usage: $0 -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name> [-i <instance urn>]"
-        exit 1;;
-    *)  break;;
-    esac
-    shift
-done
-
-[ -x "$STCLIENT" ] || exit 1
-
-# test if already registered
-if [ ! -n $INSTANCE_URN ]; then
-  TEST=`${STCLIENT} -f -t ${TARGET_URN}`; EXITCODE=$?
-
-  # retry on unexpected error codes
-  [ ${EXITCODE} -eq 0 -o  ${EXITCODE} -eq 225 ] || exit 1
-
-  # early versions did not have a dedicated exitcode, so need to compare text output
-  [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0
-fi
-
-uname=`uname -p`
-zone="global"
-
-if [ `uname -s` = "SunOS" ]; then
-  if [ -x /usr/bin/zonename ]; then
-    zone=`/usr/bin/zonename`
-  fi
-fi
-
-output=`"${STCLIENT}" -a -p "${PRODUCT_NAME}" -e "${PRODUCT_VERSION}" -t ${TARGET_URN} -S "${PRODUCT_SOURCE}" -P "${PARENT_PRODUCT_NAME}" ${INSTANCE_URN:+"-i"} ${INSTANCE_URN} -m "Sun Microsystems, Inc." -A "${uname}" -z "${zone}"`; EXITCODE=$?
-
-[ "${INSTANCE_URN}" = "" -a ${EXITCODE} -eq 226 ] && exit 0
-
-exit ${EXITCODE}
-

setup_native/source/win32/stwrapper/makefile.mk

-PRJ=..$/..$/..
-
-PRJNAME=setup_native
-TARGET=stclient_wrapper
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=GUI
-USE_DEFFILE=TRUE
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Resources ----------------------------------------------------
-
-RCFILES=resource.rc
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=\
-    $(OBJ)$/stwrapper.obj
-
-APP1OBJS=$(OBJ)$/stwrapper.obj
-
-APP1NOSAL=TRUE
-                        
-APP1TARGET=$(TARGET)	
-
-APP1NOSVRES=$(RES)$/$(TARGET).res
-
-UWINAPILIB:=
-
-STDLIB1=\
-    $(GDI32LIB)\
-    $(COMCTL32LIB)\
-    $(COMDLG32LIB)\
-    $(ADVAPI32LIB)\
-    $(SHELL32LIB)
-
-DLLPRE =
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-$(OBJ)$/stwrapper.obj: $(INCCOM)$/_version.h

setup_native/source/win32/stwrapper/resource.rc

-#define VERSION			1
-#define SUBVERSION		0
-//#define VERVARIANT	0
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
-
-#define VER_DAY			1
-#define VER_MONTH		4
-#define VER_YEAR		09
-
-
-// Header
-#if defined(_MSC_VER) && (_MSC_VER < 1500)
-#include "winres.h"
-#else
-#define WINVER 0x0500
-#include "winresrc.h"
-#endif
-#include "verinfo.hrc"
-
-#define VER_FIRSTYEAR	07
-
-#if !defined(ENGLISH)
-#define LG_D 					// generate always german version
-#endif
-
-// -----------------------------------------------------------------------
-// 				language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-	"040904B0", 	// USA -> Unicode
-	"040904E4", 	// USA -> Windows, Multilingual
-	"04090000", 	// USA -> 7-Bit-ASCII
-	0				// end of table
-}
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	fileflagsmask 0x3F
-	fileflags
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-#ifndef WIN32
-	fileos VOS_DOS_WINDOWS16
-#else
-	fileos VOS_NT_WINDOWS32
-#endif
-	filetype VFT_APP
-	{
-		block "StringFileInfo"
-		{
-			block "040904E4"
-			{
-				// International StringTable
-                value "CompanyName", 		"The Document Foundation\0"
-                value "FileDescription",    "Service Tags Wrapper\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "ProductVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	"STCLIENT_WRAPPER.EXE\0"
-                value "InternalName", 		"stclient_wrapper\0"
-                value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
-			}
-		}
-
-		block "VarFileInfo"
-		{
-			value "Translation", 0x0409, 1252
-		}
-	}
-
-// version binary entry
-VS_VERSION_INFO rcdata
-{
-	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-	VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Manifest section
-//
-1 24 stwrapper.manifest
-

setup_native/source/win32/stwrapper/stwrapper.manifest

-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Copyright © 1981-2001 Microsoft Corporation -->
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-	<assemblyIdentity
-        type="win32"
-        name="Service Tags Wrapper"
-        version="1.0.0.0"
-        processorArchitecture="x86"
-    />
-	<description>OpenOffice.org Installer</description>
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-        <security>
-            <requestedPrivileges>
-                <requestedExecutionLevel level="asInvoker" />
-            </requestedPrivileges>
-        </security>
-    </trustInfo>
-    <dependency>
-	</dependency>
-</assembly>