JBoss Native SVN: r1540 - branches.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-16 05:47:42 -0400 (Wed, 16 Apr 2008)
New Revision: 1540
Added:
branches/JBNATIVE_2_0_4/
Log:
Branch native version 2.0.4
Copied: branches/JBNATIVE_2_0_4 (from rev 1539, trunk)
16 years, 8 months
JBoss Native SVN: r1539 - trunk/build/install/installer.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-09 02:11:36 -0400 (Wed, 09 Apr 2008)
New Revision: 1539
Modified:
trunk/build/install/installer/main.c
Log:
Use default configuration if not embedded
Modified: trunk/build/install/installer/main.c
===================================================================
--- trunk/build/install/installer/main.c 2008-04-08 13:05:58 UTC (rev 1538)
+++ trunk/build/install/installer/main.c 2008-04-09 06:11:36 UTC (rev 1539)
@@ -867,9 +867,9 @@
StopSplash(HANDLE hHtml)
{
if (IS_INVALID_HANDLE(hHtml))
- return;
+ return;
DHTMLDialogStop(hHtml);
- DHTMLDialogClose(hHtml);
+ DHTMLDialogClose(hHtml);
}
@@ -1074,19 +1074,34 @@
/* Read defaults from embedded config
*/
- bRunScript = pConfig->s_flags[0];
- bMakeTemp = pConfig->s_flags[1];
- selectDest = pConfig->s_flags[2];
- opt_Verbose = pConfig->s_flags[3];
- bShowSplash = pConfig->s_flags[4];
- bShowLicense = pConfig->s_flags[5];
- dwWinTimeout = pConfig->s_iopts[0];
- dwSplTimeout = pConfig->s_iopts[1];
+ if (pConfig->s_flags[0]) {
+ bRunScript = pConfig->s_flags[1];
+ bMakeTemp = pConfig->s_flags[2];
+ selectDest = pConfig->s_flags[3];
+ opt_Verbose = pConfig->s_flags[4];
+ bShowSplash = pConfig->s_flags[5];
+ bShowLicense = pConfig->s_flags[6];
+ dwWinTimeout = pConfig->s_iopts[0];
+ dwSplTimeout = pConfig->s_iopts[1];
+ }
+ else {
+ /* Default config
+ * -q -x -S 0
+ */
+ bRunScript = TRUE;
+ bMakeTemp = TRUE;
+ selectDest = FALSE;
+ opt_Verbose = FALSE;
+ bShowSplash = TRUE;
+ bShowLicense = FALSE;
+ dwWinTimeout = INFINITE;
+ dwSplTimeout = INFINITE;
+ }
if (!GuiInitialize()) {
exit(-1);
}
- while ((ch = getopt(__argc, __argv, "aAd:f:gh:len:p:qQr:s:S:t:T:uvVw:x")) != EOF) {
+ while ((ch = getopt(__argc, __argv, "aAd:Df:gh:lLen:p:qQr:s:S:t:T:uUvVw:xX")) != EOF) {
switch (ch) {
case 'A':
case 'a':
@@ -1112,6 +1127,10 @@
case 'g':
szEulaPage = "/HTML_LGPLMAIN";
break;
+ case 'D':
+ szDest[0] = '~';
+ selectDest = FALSE;
+ break;
case 'd':
if (*optarg == '~') {
szDest[0] = '~';
@@ -1152,6 +1171,9 @@
case 'l':
bShowLicense = TRUE;
break;
+ case 'L':
+ bShowLicense = FALSE;
+ break;
case 'e':
bMerge = TRUE;
break;
@@ -1168,11 +1190,17 @@
dwHtmlHeight = (DWORD)atoi(optarg);
break;
case 'u':
- bMakeTemp = !bMakeTemp;
+ bMakeTemp = TRUE;
break;
+ case 'U':
+ bMakeTemp = FALSE;
+ break;
case 'x':
bRunScript = TRUE;
break;
+ case 'X':
+ bRunScript = FALSE;
+ break;
case '?':
r = EINVAL;
goto cleanup;
@@ -1198,12 +1226,13 @@
}
/* Get original stub size */
GetFileInformationByHandle(hStub, &si);
- pConfig->s_flags[0] = bRunScript;
- pConfig->s_flags[1] = bMakeTemp;
- pConfig->s_flags[2] = selectDest;
- pConfig->s_flags[3] = opt_Verbose;
- pConfig->s_flags[4] = bShowSplash;
- pConfig->s_flags[5] = bShowLicense;
+ pConfig->s_flags[0] = 1;
+ pConfig->s_flags[1] = bRunScript;
+ pConfig->s_flags[2] = bMakeTemp;
+ pConfig->s_flags[3] = selectDest;
+ pConfig->s_flags[4] = opt_Verbose;
+ pConfig->s_flags[5] = bShowSplash;
+ pConfig->s_flags[6] = bShowLicense;
pConfig->s_iopts[0] = dwWinTimeout;
pConfig->s_iopts[1] = dwSplTimeout;
r = MergeConfig(si.nFileSizeLow);
16 years, 9 months
JBoss Native SVN: r1538 - in trunk/build/install: xtool and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 09:05:58 -0400 (Tue, 08 Apr 2008)
New Revision: 1538
Modified:
trunk/build/install/installer/installers/jbossas/_install/install.bat
trunk/build/install/xtool/xtool.c
Log:
Add xcopy tool
Modified: trunk/build/install/installer/installers/jbossas/_install/install.bat
===================================================================
--- trunk/build/install/installer/installers/jbossas/_install/install.bat 2008-04-08 12:40:48 UTC (rev 1537)
+++ trunk/build/install/installer/installers/jbossas/_install/install.bat 2008-04-08 13:05:58 UTC (rev 1538)
@@ -112,12 +112,11 @@
REM Do an actual installation in INSTALL_DEST/PACKAGE_NAME by copying the files from
REM INSTALL_BASE/PACKAGE_NAME
-xcopy /Q /Y /E /I /C "%INSTALL_BASE%%PACKAGE_NAME%" "%INSTALL_DEST%\%PACKAGE_NAME%" > .result
-set /P XTOOLRC= < .result
-del /Q /F .result
+xtool xcopy -q "Installing %INSTALL_NAME%" "%INSTALL_BASE%%PACKAGE_NAME%" "%INSTALL_DEST%\%PACKAGE_NAME%"
+if %errorlevel% == 0 (
+ xtool msg -qt MB_OK -i ? "Istallation finished" "%INSTALL_DESC% installed in##%INSTALL_DEST%\%PACKAGE_NAME%"
+)
-xtool msg -qt MB_OK -i ? "Istallation finished" "%INSTALL_DESC% installed in##%INSTALL_DEST%\%PACKAGE_NAME%##%XTOOLRC%"
-
:cmdEnd
echo Finished %INSTALL_PROG% %DATE% %TIME%
exit %RETVAL%
Modified: trunk/build/install/xtool/xtool.c
===================================================================
--- trunk/build/install/xtool/xtool.c 2008-04-08 12:40:48 UTC (rev 1537)
+++ trunk/build/install/xtool/xtool.c 2008-04-08 13:05:58 UTC (rev 1538)
@@ -3595,6 +3595,14 @@
return retval;
}
+static int prog_xcopy_usage(int retval)
+{
+ fprintf(stderr, "Usage: %s [OPTION]... TITLE SOURCE DESTINATION\n", progname);
+ fprintf(stderr, "Copies files from SOURCE to DESTINATION\n\n");
+ print_stdusage();
+ return retval;
+}
+
/*
* ---------------------------------------------------------------------
* end of programs usage
@@ -5485,6 +5493,75 @@
return rv;
}
+static int prog_xcopy(int argc, const char **argv, const char **env)
+{
+ int ch, rv = 0;
+ wchar_t *p, *msg = NULL;
+ SHFILEOPSTRUCTW shOp;
+
+ if (!GuiInitialize()) {
+ return x_perror(0, "Windows GUI");
+ }
+ while ((ch = getopt(argc, argv, "hqvV", 0)) != EOF) {
+ switch (ch) {
+ case '.':
+ if (!stricmp(optarg, "verbose"))
+ xtrace = 1;
+ else if (!stricmp(optarg, "version"))
+ return print_banner(1);
+ else if (!stricmp(optarg, "help"))
+ return prog_xcopy_usage(0);
+ else
+ return prog_xcopy_usage(EINVAL);
+ break;
+ case 'v':
+ xtrace = 1;
+ break;
+ case 'V':
+ xtrace = 9;
+ break;
+ case 'q':
+ xquiet = 1;
+ break;
+ case 'h':
+ return prog_xcopy_usage(0);
+ break;
+ case '?':
+ case ':':
+ return EINVAL;
+ break;
+ }
+ }
+ argc -= optind;
+ argv += optind;
+ if (argc < 3) {
+ return prog_xcopy_usage(EINVAL);
+ }
+ msg = x_wstrdup_utf8(argv[0]);
+ for (p = msg; *p; p++) {
+ if (*p == L'#' && *(p + 1) == L'#') {
+ *(p++) = L'\r';
+ *(p++) = L'\n';
+ }
+ }
+
+ shOp.hwnd = HWND_DESKTOP;
+ shOp.wFunc = FO_COPY;
+ shOp.fFlags = FOF_NOCONFIRMATION |
+ FOF_NOCONFIRMMKDIR |
+ FOF_SIMPLEPROGRESS;
+
+ shOp.pFrom = x_wstrdup_utf8(argv[1]);
+ shOp.pTo = x_wstrdup_utf8(argv[2]);
+ shOp.lpszProgressTitle = msg;
+
+ rv = SHFileOperationW(&shOp);
+ x_free(msg);
+ x_free((wchar_t *)shOp.pFrom);
+ x_free((wchar_t *)shOp.pTo);
+ return rv;
+}
+
/*
* ---------------------------------------------------------------------
* end of programs
@@ -5511,6 +5588,7 @@
{ "msg", prog_msg },
{ "jdk", prog_jdk },
{ "dir", prog_browse },
+ { "xcopy", prog_xcopy },
{ NULL, NULL }
};
16 years, 9 months
JBoss Native SVN: r1537 - in trunk/build/install/installer: res and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 08:40:48 -0400 (Tue, 08 Apr 2008)
New Revision: 1537
Modified:
trunk/build/install/installer/main.c
trunk/build/install/installer/res/splash.htm
Log:
Use more distinctive name for the splash window
Modified: trunk/build/install/installer/main.c
===================================================================
--- trunk/build/install/installer/main.c 2008-04-08 12:38:55 UTC (rev 1536)
+++ trunk/build/install/installer/main.c 2008-04-08 12:40:48 UTC (rev 1537)
@@ -857,7 +857,7 @@
sprintf(sBuf, "%s", GetProgramName());
DHTMLDialogStart(NULL, hHtml,
- "JBoss",
+ "Initializing JBoss Installer",
DEF_WWIDTH, DEF_WHEIGHT, 1, dwTimeout,
sBuf);
return hHtml;
Modified: trunk/build/install/installer/res/splash.htm
===================================================================
--- trunk/build/install/installer/res/splash.htm 2008-04-08 12:38:55 UTC (rev 1536)
+++ trunk/build/install/installer/res/splash.htm 2008-04-08 12:40:48 UTC (rev 1537)
@@ -2,7 +2,7 @@
<HEAD lang="en">
<META http-equiv="Content-Type" content="text/html; charset=windows-1252">
<META http-equiv="MSThemeCompatible" content="Yes">
- <TITLE>JBoss</TITLE>
+ <TITLE>Initializing JBoss Installer</TITLE>
<STYLE type="text/css">
BODY, TABLE, TR, TD, UL, OL, LI, P {
font-family: MS Shell Dlg;
16 years, 9 months
JBoss Native SVN: r1536 - trunk/build/install/installer/res.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 08:38:55 -0400 (Tue, 08 Apr 2008)
New Revision: 1536
Modified:
trunk/build/install/installer/res/splash.htm
Log:
Set maximum splash timeout to 1 minute
Modified: trunk/build/install/installer/res/splash.htm
===================================================================
--- trunk/build/install/installer/res/splash.htm 2008-04-08 12:34:58 UTC (rev 1535)
+++ trunk/build/install/installer/res/splash.htm 2008-04-08 12:38:55 UTC (rev 1536)
@@ -67,7 +67,7 @@
function pageOnLoad()
{
window.returnValue = null;
- setTimeout("onTimeout()", 10000);
+ setTimeout("onTimeout()", 60000);
return true;
}
16 years, 9 months
JBoss Native SVN: r1535 - trunk/build/install/installer.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 08:34:58 -0400 (Tue, 08 Apr 2008)
New Revision: 1535
Modified:
trunk/build/install/installer/dhtml.c
Log:
Don't close window too early
Modified: trunk/build/install/installer/dhtml.c
===================================================================
--- trunk/build/install/installer/dhtml.c 2008-04-08 12:32:35 UTC (rev 1534)
+++ trunk/build/install/installer/dhtml.c 2008-04-08 12:34:58 UTC (rev 1535)
@@ -339,8 +339,10 @@
if (IS_INVALID_HANDLE(hHtmlDlg))
return FALSE;
-
- if ((i = WaitForSingleObject(hDlg->hThread, 0)) == WAIT_TIMEOUT) {
+ /* Wait for at least one second so that
+ * window doesn't close too early
+ */
+ if ((i = WaitForSingleObject(hDlg->hThread, 1000)) == WAIT_TIMEOUT) {
if (hDlg->hWnd) {
SendMessage(hDlg->hWnd, WM_CLOSE, 0, 0);
WaitForSingleObject(hDlg->hThread, INFINITE);
16 years, 9 months
JBoss Native SVN: r1534 - in trunk/build/install/installer: installers/jbossas and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 08:32:35 -0400 (Tue, 08 Apr 2008)
New Revision: 1534
Modified:
trunk/build/install/installer/dhtml.c
trunk/build/install/installer/installers/jbossas/README
trunk/build/install/installer/main.c
trunk/build/install/installer/sinstall.h
Log:
Add option to close the splash on demand (when unzipping is done)
Modified: trunk/build/install/installer/dhtml.c
===================================================================
--- trunk/build/install/installer/dhtml.c 2008-04-08 10:49:32 UTC (rev 1533)
+++ trunk/build/install/installer/dhtml.c 2008-04-08 12:32:35 UTC (rev 1534)
@@ -37,6 +37,9 @@
typedef struct {
IMoniker *lpImk;
CHAR szReturnVal[HBUF_SIZE];
+ HWND hWnd;
+ HANDLE hThread;
+ int iIndex;
} MC_HTML_DIALOG, *LPMC_HTML_DIALOG;
typedef struct DHTML_THREAD_PARAMS {
@@ -268,3 +271,86 @@
return hDlg->szReturnVal;
}
+
+BOOL
+DHTMLDialogStart(
+ HWND hParent,
+ HANDLE hHtmlDlg,
+ LPCSTR szTitle,
+ DWORD dwWidth,
+ DWORD dwHeight,
+ DWORD dwFlags,
+ DWORD dwTimeout,
+ LPCSTR szArguments)
+{
+ DWORD dwThreadId;
+ HANDLE hThread;
+ HWND hWnd = NULL;
+ DWORD i;
+ LPMC_HTML_DIALOG hDlg = (LPMC_HTML_DIALOG)hHtmlDlg;
+ DHTML_THREAD_PARAMS pD;
+ int w = -1;
+
+ if (IS_INVALID_HANDLE(hHtmlDlg))
+ return FALSE;
+ pD.hParent = hParent;
+ pD.hHtmlDlg = hHtmlDlg;
+ swprintf(pD.szOptions,
+ L"scroll: no; status: no; help: no; dialogHeight: %dpx; dialogWidth: %dpx",
+ dwHeight, dwWidth);
+ if (dwFlags == 1)
+ wcscat(pD.szOptions, L"; unadorned:yes");
+ if (szArguments)
+ AnsiToWide(szArguments, pD.szArguments,
+ ARRAYSIZE(pD.szArguments));
+
+ hThread = CreateThread(NULL,
+ 0,
+ dhtmlRunThread,
+ &pD,
+ 0,
+ &dwThreadId);
+ if (IS_INVALID_HANDLE(hThread))
+ return FALSE;
+
+ /* Hack to change the Icon of HTML Dialog */
+ for (i = 0; i < 1000; i++) {
+ if ((hWnd = FindWindowEx(hParent, NULL, NULL, szTitle))) {
+ w = GuiRegisterWindow(hWnd);
+ SetClassLong(hWnd, GCL_HICONSM, (LONG)gui_h16Icon);
+ break;
+ }
+ if (pD.bDone)
+ break;
+ Sleep(1);
+ }
+ hDlg->hThread = hThread;
+ hDlg->hWnd = hWnd;
+ hDlg->iIndex = w;
+ return TRUE;
+}
+
+BOOL
+DHTMLDialogStop(HANDLE hHtmlDlg)
+{
+ DWORD i;
+ BOOL rv = FALSE;
+ LPMC_HTML_DIALOG hDlg = (LPMC_HTML_DIALOG)hHtmlDlg;
+
+ if (IS_INVALID_HANDLE(hHtmlDlg))
+ return FALSE;
+
+ if ((i = WaitForSingleObject(hDlg->hThread, 0)) == WAIT_TIMEOUT) {
+ if (hDlg->hWnd) {
+ SendMessage(hDlg->hWnd, WM_CLOSE, 0, 0);
+ WaitForSingleObject(hDlg->hThread, INFINITE);
+ }
+ }
+ if (GetExitCodeThread(hDlg->hThread, &i) && i == 0) {
+ rv = TRUE;
+ }
+ CloseHandle(hDlg->hThread);
+ GuiUnregisterWindow(hDlg->iIndex);
+
+ return rv;
+}
Modified: trunk/build/install/installer/installers/jbossas/README
===================================================================
--- trunk/build/install/installer/installers/jbossas/README 2008-04-08 10:49:32 UTC (rev 1533)
+++ trunk/build/install/installer/installers/jbossas/README 2008-04-08 12:32:35 UTC (rev 1534)
@@ -9,6 +9,9 @@
4. Merge the sinstall stub
> copy /Y /b sinstall.exe + /b jboss-5.0.0.Beta4.install.zip jboss-5.0.0.Beta4.exe
5. Embedd parameters to the installer
- > sinstall -qxu -S 2 -e jboss-5.0.0.Beta4.exe
+ > sinstall -qxu -S 0 -e jboss-5.0.0.Beta4.exe
+ This step can be ommited if the sinstall already has embedded config
+6. Fix zip sfx archive
+ > zip -A jboss-5.0.0.Beta4.exe
That's it
Modified: trunk/build/install/installer/main.c
===================================================================
--- trunk/build/install/installer/main.c 2008-04-08 10:49:32 UTC (rev 1533)
+++ trunk/build/install/installer/main.c 2008-04-08 12:32:35 UTC (rev 1534)
@@ -845,32 +845,34 @@
return rv;
}
-static BOOL
-ShowSplash(LPCSTR szPage, DWORD dwTimeout)
+static HANDLE
+StartSplash(LPCSTR szPage, DWORD dwTimeout)
{
HANDLE hHtml;
CHAR sBuf[MAX_PATH] = { 0 };
- CHAR *retVal;
- BOOL rv = FALSE;
hHtml = DHTMLDialogInit(GetModuleHandle(NULL), szPage);
if (IS_INVALID_HANDLE(hHtml))
- return FALSE;
+ return NULL;
sprintf(sBuf, "%s", GetProgramName());
- DHTMLDialogRun(NULL, hHtml,
- "JBoss",
- DEF_WWIDTH, DEF_WHEIGHT, 1, dwTimeout,
- sBuf);
- retVal = DHTMLDialogResult(hHtml);
- if (retVal && !strncmp(retVal, "OK", 2)) {
- rv = TRUE;
- }
- DHTMLDialogClose(hHtml);
+ DHTMLDialogStart(NULL, hHtml,
+ "JBoss",
+ DEF_WWIDTH, DEF_WHEIGHT, 1, dwTimeout,
+ sBuf);
+ return hHtml;
+}
- return rv;
+static void
+StopSplash(HANDLE hHtml)
+{
+ if (IS_INVALID_HANDLE(hHtml))
+ return;
+ DHTMLDialogStop(hHtml);
+ DHTMLDialogClose(hHtml);
}
+
static BOOL
RunCustomPage(
LPCSTR szHtmlPage,
@@ -1064,6 +1066,7 @@
DWORD dwHtmlHeight = DEF_WHEIGHT;
DWORD dwFlags = 0;
LPCSTR szEulaPage = "/HTML_EULAMAIN";
+ HANDLE hSplash = NULL;
PROCESS_INFORMATION prInfo;
atexit(ExitCleanup);
@@ -1231,8 +1234,7 @@
goto cleanup;
}
if (bShowSplash) {
- ShowSplash("/HTML_SPLASH", dwSplTimeout);
- Sleep(200);
+ hSplash = StartSplash("/HTML_SPLASH", dwSplTimeout);
}
/* Standard Install */
@@ -1312,6 +1314,7 @@
x_perror(EINVAL, "Uncompressing");
}
DESTROYGLOBALS();
+ StopSplash(hSplash);
if (bRunScript) {
szCmdLine = BuildCommandLine(szCmdExe,
CMD_BATCH,
Modified: trunk/build/install/installer/sinstall.h
===================================================================
--- trunk/build/install/installer/sinstall.h 2008-04-08 10:49:32 UTC (rev 1533)
+++ trunk/build/install/installer/sinstall.h 2008-04-08 12:32:35 UTC (rev 1534)
@@ -141,5 +141,7 @@
void DHTMLDialogClose(HANDLE);
BOOL DHTMLDialogRun(HWND, HANDLE, LPCSTR, DWORD, DWORD, DWORD, DWORD, LPCSTR);
LPSTR DHTMLDialogResult(HANDLE);
+BOOL DHTMLDialogStart(HWND, HANDLE, LPCSTR, DWORD, DWORD, DWORD, DWORD, LPCSTR);
+BOOL DHTMLDialogStop(HANDLE);
#endif /* SINSTALL_H */
16 years, 9 months
JBoss Native SVN: r1533 - in trunk/build/install/installer: installers and 2 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 06:49:32 -0400 (Tue, 08 Apr 2008)
New Revision: 1533
Added:
trunk/build/install/installer/installers/
trunk/build/install/installer/installers/jbossas/
trunk/build/install/installer/installers/jbossas/README
trunk/build/install/installer/installers/jbossas/_install/
trunk/build/install/installer/installers/jbossas/_install/README
trunk/build/install/installer/installers/jbossas/_install/eula.htm
trunk/build/install/installer/installers/jbossas/_install/eulamain.htm
trunk/build/install/installer/installers/jbossas/_install/install.bat
trunk/build/install/installer/installers/jbossas/_install/jbosstop.png
trunk/build/install/installer/installers/jbossas/_install/redhat16.png
Log:
Add JBoss AS installer example
Added: trunk/build/install/installer/installers/jbossas/README
===================================================================
--- trunk/build/install/installer/installers/jbossas/README (rev 0)
+++ trunk/build/install/installer/installers/jbossas/README 2008-04-08 10:49:32 UTC (rev 1533)
@@ -0,0 +1,14 @@
+Making installation
+
+1. Unzip JBoss AS .zip distribution in this directory
+ > unzip jboss-5.0.0.Beta4
+2. Modify the _install\install bat so that PACKAGE_NAME
+ is the same as unizpped directory
+3. Create new zip file
+ > zip -qr -9 jboss-5.0.0.Beta4.install.zip _install jboss-5.0.0.Beta4
+4. Merge the sinstall stub
+ > copy /Y /b sinstall.exe + /b jboss-5.0.0.Beta4.install.zip jboss-5.0.0.Beta4.exe
+5. Embedd parameters to the installer
+ > sinstall -qxu -S 2 -e jboss-5.0.0.Beta4.exe
+
+That's it
Property changes on: trunk/build/install/installer/installers/jbossas/README
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/build/install/installer/installers/jbossas/_install/README
===================================================================
--- trunk/build/install/installer/installers/jbossas/_install/README (rev 0)
+++ trunk/build/install/installer/installers/jbossas/_install/README 2008-04-08 10:49:32 UTC (rev 1533)
@@ -0,0 +1 @@
+Installer private directory
Property changes on: trunk/build/install/installer/installers/jbossas/_install/README
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/build/install/installer/installers/jbossas/_install/eula.htm
===================================================================
--- trunk/build/install/installer/installers/jbossas/_install/eula.htm (rev 0)
+++ trunk/build/install/installer/installers/jbossas/_install/eula.htm 2008-04-08 10:49:32 UTC (rev 1533)
@@ -0,0 +1,225 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HEAD lang="en">
+ <META http-equiv="Content-Type" content="text/html; charset=windows-1252">
+ <META http-equiv="MSThemeCompatible" content="Yes">
+ <TITLE>License Agreement</TITLE>
+ <STYLE type="text/css">
+ BODY, TABLE, TR, TD, UL, OL, LI, P {
+ font-family: Serife, Verdana, Helvetica, Tahoma;
+ font-size: 11px;
+ font-style: normal;
+ text-decoration: none;
+ background-color: Window;
+ color: WindowText;
+ }
+ PRE {
+ font-size: 10px;
+ font-style: normal;
+ text-decoration: none;
+ background-color: Window;
+ color: WindowText;
+ }
+ H1 {
+ font-family: Serife, Verdana, Helvetica, Tahoma;
+ font-size: 18px;
+ }
+ H2 {
+ font-family: Serife, Verdana, Helvetica, Tahoma;
+ font-size: 13px;
+ }
+ A {
+ color: blue;
+ }
+ </STYLE>
+</HEAD>
+<BODY scroll="auto" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"
+ marginwidth="0" marginheight="0">
+<DIV style="position:absolute; top:0px; left:4px; width:482px;">
+<BR/>
+<h1>License Agreement</h1>
+<p>
+<h2>JBoss�</h2>
+</p>
+
+<p>
+This License Agreement governs the use of the Software Packages and
+any updates to the Software Packages, regardless of the delivery mechanism.
+Each Software Package is a collective work under U.S. Copyright Law.
+Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the
+user ("Client") a license to the applicable collective work(s) pursuant to
+the GNU Lesser General Public License v. 2.1 except for the following Software
+Packages:
+</p>
+<ul>
+ <li><strong>a)</strong>
+ JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed
+ pursuant to the GNU General Public License v.2;
+ </li>
+ <li><strong>b)</strong>
+ JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+ </li>
+ <li><strong>b)</strong>
+ an optional download for JBoss Cache for the Berkeley DB for Java database,
+ which is licensed under the (open source) Sleepycat License (if Client does
+ not wish to use the open source version of this database, it may purchase a
+ license from Sleepycat Software);
+ <br/><br/>and<br/><br/>
+ </li>
+ <li><strong>d)</strong>
+ the BPEL extension for JBoss jBPM, which is licensed under the Common Public
+ License v.1, and, pursuant to the OASIS BPEL4WS standard, requires parties
+ wishing to redistribute to enter various royalty-free patent licenses.
+ </li>
+</ul>
+<p>
+Each of the foregoing licenses is available at
+<a target="_blank" href="http://www.opensource.org/licenses/index.php">
+http://www.opensource.org/licenses/index.php
+</a>
+</p>
+
+<p><strong>1.</strong>
+The Software. "Software Packages" refer to the various software modules that
+are created and made available for distribution by the JBoss.org open source
+community at
+<a target="_blank" href="http://www.jboss.org">
+http://www.jboss.org.</a> Each of the Software Packages may be
+comprised of hundreds of software components. The end user license agreement
+for each component is located in the component's source code. With the
+exception of certain image files identified in Section 2 below, the license
+terms for the components permit Client to copy, modify, and redistribute the
+component, in both source code and binary code forms. This agreement does not
+limit Client's rights under, or grant Client rights that supersede, the license
+terms of any particular component.
+</p>
+
+<p><strong>2.</strong>
+Intellectual Property Rights.The Software Packages are owned by Red Hat and
+others and are protected under copyright and other laws. Title to the
+Software Packages and any component, or to any copy, modification, or merged
+portion shall remain with the aforementioned, subject to the applicable
+license. The "JBoss" trademark, "Red Hat" trademark, the individual Software
+Package trademarks, and the "Shadowman" logo are registered trademarks of
+Red Hat and its affiliates in the U.S. and other countries.
+This agreement permits Client to distribute unmodified copies of the Software
+Packages using the Red Hat trademarks that Red Hat has inserted in the Software
+Packages on the condition that Client follows Red Hat's trademark guidelines
+for those trademarks located at
+<a target="_blank" href="http://www.redhat.com/about/corporate/trademark/">
+http://www.redhat.com/about/corporate/trademark/.</a>
+Client must abide by these trademark guidelines when distributing the Software
+Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat
+trademarks and logos identified at
+<a target="_blank" href="http://www.jboss.com/company/logos">
+http://www.jboss.com/company/logos</a> unless a
+separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt
+the Software Packages.
+</p>
+
+<p><strong>3.</strong>
+Limited Warranty. Except as specifically stated in this Paragraph 3 or a license
+for a particular component, to the maximum extent permitted under applicable law,
+the Software Packages and the components are provided and licensed "as is"
+without warranty of any kind, expressed or implied, including the implied
+warranties of merchantability, non-infringement or fitness for a particular
+purpose. Red Hat warrants that the media on which Software Packages may be
+furnished will be free from defects in materials and manufacture under normal
+use for a period of 30 days from the date of delivery to Client. Red Hat does
+not warrant that the functions contained in the Software Packages will meet
+Client's requirements or that the operation of the Software Packages will be
+entirely error free or appear precisely as described in the accompanying
+documentation. This warranty extends only to the party that purchases the
+Services pertaining to the Software Packages from Red Hat or a Red Hat
+authorized distributor.
+</p>
+
+<p><strong>4.</strong>
+Limitation of Remedies and Liability. To the maximum extent permitted by
+applicable law, the remedies described below are accepted by Client as its
+only remedies. Red Hat's entire liability, and Client's exclusive remedies,
+shall be: If the Software media is defective, Client may return it within 30
+days of delivery along with a copy of Client's payment receipt and Red Hat,
+at its option, will replace it or refund the money paid by Client for the
+Software. To the maximum extent permitted by applicable law, Red Hat or any
+Red Hat authorized dealer will not be liable to Client for any incidental or
+consequential damages, including lost profits or lost savings arising out of
+the use or inability to use the Software, even if Red Hat or such dealer has
+been advised of the possibility of such damages. In no event shall Red Hat's
+liability under this agreement exceed the amount that Client paid to Red Hat
+under this Agreement during the twelve months preceding the action.
+</p>
+
+<p><strong>5.</strong>
+Export Control. As required by U.S. law, Client represents and
+warrants that it:
+<ul>
+ <li><strong>a)</strong>
+ understands that the Software Packages are subject to export controls under
+ the U.S. Commerce Department's Export Administration Regulations ("EAR");
+ </li>
+ <li><strong>b)</strong>
+ is not located in a prohibited destination country under the EAR or U.S.
+ sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea,
+ Sudan and Syria);
+ </li>
+ <li><strong>c)</strong>
+ will not export, re-export, or transfer the Software Packages to any
+ prohibited destination, entity, or individual without the necessary export
+ license(s) or authorizations(s) from the U.S. Government;
+ </li>
+ <li><strong>d)</strong>
+ will not use or transfer the Software Packages for use in any sensitive
+ nuclear, chemical or biological weapons, or missile technology end-uses
+ unless authorized by the U.S. Government by regulation or specific
+ license;
+ </li>
+ <li><strong>e)</strong>
+ understands and agrees that if it is in the United States and exports or
+ transfers the Software Packages to eligible end users, it will, as
+ required by EAR Section 740.17(e), submit semi-annual reports to
+ the Commerce Department's Bureau of Industry & Security (BIS), which
+ include the name and address (including country) of each transferee;
+ </li>
+ <br/><br/>and<br/><br/>
+ <li><strong>f)</strong>
+ understands that countries other than the United States may restrict the
+ import, use, or export of encryption products and that it shall be solely
+ responsible for compliance with any such import, use, or export restrictions.
+ </li>
+</ul>
+</p>
+
+<p><strong>6.</strong>
+Third Party Programs. Red Hat may distribute third party software programs
+with the Software Packages that are not part of the Software Packages and
+which Client must install separately. These third party programs are subject
+to their own license terms. The license terms either accompany the programs
+or can be viewed at
+<a target="_blank" href="http://www.redhat.com/licenses/">
+http://www.redhat.com/licenses/</a>. If Client does not agree
+to abide by the applicable license terms for such programs, then Client may
+not install them. If Client wishes to install the programs on more than one
+system or transfer the programs to another party, then Client must contact
+the licensor of the programs.
+</p>
+
+<p><strong>7.</strong>
+General. If any provision of this agreement is held to be unenforceable,
+that shall not affect the enforceability of the remaining provisions.
+This License Agreement shall be governed by the laws of the State of North
+Carolina and of the United States, without regard to any conflict of laws
+provisions, except that the United Nations Convention on the International
+Sale of Goods shall not apply.
+</p>
+
+<pre>
+Copyright © 2006-2008 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+</pre>
+
+</DIV>
+</BODY>
+</HTML>
Added: trunk/build/install/installer/installers/jbossas/_install/eulamain.htm
===================================================================
--- trunk/build/install/installer/installers/jbossas/_install/eulamain.htm (rev 0)
+++ trunk/build/install/installer/installers/jbossas/_install/eulamain.htm 2008-04-08 10:49:32 UTC (rev 1533)
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HEAD lang="en">
+ <META http-equiv="Content-Type" content="text/html; charset=windows-1252">
+ <META http-equiv="MSThemeCompatible" content="Yes">
+ <TITLE>Accept License Agreement</TITLE>
+ <STYLE type="text/css">
+ BODY, TABLE, TR, TD, UL, OL, LI, P {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ font-style: normal;
+ text-decoration: none;
+ background-color: ButtonFace;
+ color: ButtonText;
+ }
+ INPUT {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ }
+ TH {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ font-style: normal;
+ text-decoration: none;
+ text-align: left;
+ line-height: 22px;
+ background-color: ActiveCaption;
+ color: CaptionText;
+ }
+ H1 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 24px;
+ }
+ H2 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 20px;
+ }
+ H3 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 18px;
+ }
+ H4 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 13px;
+ }
+ A {
+ color: blue;
+ }
+ IFRAME {
+ border-left:0px;
+ border-right:0px;
+ border-top:1px solid;
+ border-top-color: ActiveBorder;
+ border-bottom:1px solid;
+ border-bottom-color: ActiveBorder;
+ }
+ .hide {
+ display: none;
+ visibility: hidden;
+ }
+ .show {
+ display: block;
+ visibility: visible;
+ }
+ </STYLE>
+ <SCRIPT language="JScript">
+
+ function pageOnLoad()
+ {
+ window.returnValue = null;
+ if (window.dialogArguments != null) {
+ var args;
+ args = window.dialogArguments.split("\t");
+ for (i = 0; i < args.length; i++) {
+ try {
+ obj = eval("val" + i);
+ if (obj != null)
+ obj.value = args[i];
+ } catch (err) {
+ // Nothing
+ }
+ }
+ }
+ iLicense.focus();
+ return true;
+ }
+
+ function okClick()
+ {
+ rv = "OK";
+ for (i = 0; i < 4; i++) {
+ try {
+ obj = eval("val" + i);
+ if (obj != null) {
+ rv = rv + "\t" + obj.value;
+ }
+ } catch (err) {
+ // Nothing
+ }
+ }
+ window.returnValue = rv;
+ window.close();
+ }
+
+ function cancelClick()
+ {
+ window.returnValue = "CANCEL";
+ window.close();
+ }
+
+ function onAcceptClick()
+ {
+ if (accept.checked)
+ ok.disabled=false;
+ else
+ ok.disabled=true;
+ }
+ </SCRIPT>
+</HEAD>
+<BODY scroll="no" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0"
+ marginwidth="0" marginheight="0" onload="pageOnLoad(); return true;">
+<DIV style="position:absolute; top:0px; left:0px; width=505px; height:360px; border:0px solid;">
+<DIV style="position:absolute; top:0px; left:0px; width=505px; height:48px;">
+<IMG src="jbosstop.png" border="0"/>
+</DIV>
+<DIV style="position:absolute; top:48px; left:0px; width=505px;">
+<IFRAME src="eula.htm" id="iLicense" FRAMEBORDER=0 SCROLLING=YES style="width: 100%; height: 240px;"></IFRAME>
+</DIV>
+<DIV style="position:absolute; top:296px; left:6px; width=505px; height:48px;">
+ <strong style="color:red;">Required: </strong> You must accept the License Agreement to install the product.<br/>
+<INPUT type="checkbox" id="accept" onclick="onAcceptClick();"/> Accept License Agreement
+</DIV>
+<DIV style="position:absolute; top:336px; left:10px; width=300px;">
+<IMG src="redhat16.png" border="0" width=16 height=16/> Copyright © 2008 Red Hat® Middleware, LLC.
+</DIV>
+<DIV style="position:absolute; top:310px; left:300px;">
+<TABLE cellspacing="0" style="margin:6px;">
+ <TR>
+ <TD align="right">
+ <INPUT type="button" value="Accept" disabled id="ok" style="width: 88px; height: 24px; cursor: hand;" onclick="okClick();"/>
+ <INPUT type="button" value="Decline" id="cancel" style="width: 88px; height: 24px; cursor: hand;" onclick="cancelClick();"/>
+ </TD>
+ </TR>
+</TABLE>
+</DIV>
+</DIV>
+</BODY>
+</HTML>
Added: trunk/build/install/installer/installers/jbossas/_install/install.bat
===================================================================
--- trunk/build/install/installer/installers/jbossas/_install/install.bat (rev 0)
+++ trunk/build/install/installer/installers/jbossas/_install/install.bat 2008-04-08 10:49:32 UTC (rev 1533)
@@ -0,0 +1,123 @@
+@echo off
+REM Copyright(c) 2007 Red Hat Middleware, LLC,
+REM and individual contributors as indicated by the @authors tag.
+REM See the copyright.txt in the distribution for a
+REM full listing of individual contributors.
+REM
+REM This library is free software; you can redistribute it and/or
+REM modify it under the terms of the GNU Lesser General Public
+REM License as published by the Free Software Foundation; either
+REM version 2 of the License, or (at your option) any later version.
+REM
+REM This library is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+REM Lesser General Public License for more details.
+REM
+REM You should have received a copy of the GNU Lesser General Public
+REM License along with this library in the file COPYING.LIB;
+REM if not, write to the Free Software Foundation, Inc.,
+REM 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+REM
+REM -------------------------------------------------------------------------
+REM JBoss Installer Script for Windows
+REM -------------------------------------------------------------------------
+REM @author Mladen Turk
+REM
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal enableextensions
+
+SET RETVAL=0
+if "%OS%" == "Windows_NT" (
+ set "INSTALL_HOME=%~dp0%"
+ set "INSTALL_PROG=%~nx0%"
+) else (
+ echo Detected uncompatible Windows version.
+ set RETVAL=2
+ goto cmdEnd
+)
+
+REM -------------------------------------------------------------------------
+REM Start of package definitions
+REM -------------------------------------------------------------------------
+
+set PACKAGE_NAME=jboss-5.0.0.Beta4
+set INSTALL_NAME=JBoss Application Server
+set INSTALL_DESC=JBoss Application Server 5.0.0.Beta4
+
+REM -------------------------------------------------------------------------
+REM End of package definitions
+REM -------------------------------------------------------------------------
+
+echo Started %INSTALL_PROG% %DATE% %TIME%
+
+pushd %INSTALL_HOME%..
+set INSTALL_BASE=%CD%\
+popd
+
+echo INSTALL_PROG: %INSTALL_PROG%
+echo INSTALL_HOME: %INSTALL_HOME%
+echo INSTALL_BASE: %INSTALL_BASE%
+
+set XTOOLRC=
+xtool.exe html -q eulamain.htm > .result
+set /P XTOOLRC= < .result
+del /Q /F .result
+
+if NOT "%XTOOLRC%" == "OK" (
+ xtool msg -qt MB_OK -i s "License Agreement" "Cannot continue.##You must accept License Agreement to install this software"
+ echo License Agreement not accepted
+ SET RETVAL=3
+ goto cmdEnd
+)
+
+set INSTALL_DEST=
+xtool.exe dir -q "Select Installation Folder##The Software will be installed in the selected location" > .result
+for /f "usebackq tokens=*" %%I in (.result) do (
+ if exist "%%I" set INSTALL_DEST=%%I
+)
+del /Q /F .result
+
+set errorlevel=
+if NOT "x%INSTALL_DEST%" == "x" (
+ xtool msg -qt MB_OKCANCEL -i i "Start Installation" "%INSTALL_DESC% is ready to install.##Location: %INSTALL_DEST%"
+) else (
+ echo Destination directory not specified
+ set RETVAL=1
+ goto cmdEnd
+)
+
+if not %errorlevel% == 1 (
+ echo Installation canceled
+ set RETVAL=1
+ goto cmdEnd
+)
+
+
+set errorlevel=
+if exist "%INSTALL_DEST%\%PACKAGE_NAME%" (
+ xtool msg -qt MB_YESNO -i ? "Directory exist" "%INSTALL_DESC% in##%INSTALL_DEST%\%PACKAGE_NAME% already exist.##Do you wish to overwite the target"
+ echo ERR1 %errorlevel%
+) else (
+ set errorlevel=6
+)
+
+if not %errorlevel% == 6 (
+ echo Installation overwrite denied
+ set RETVAL=1
+ goto cmdEnd
+)
+
+REM Do an actual installation in INSTALL_DEST/PACKAGE_NAME by copying the files from
+REM INSTALL_BASE/PACKAGE_NAME
+
+xcopy /Q /Y /E /I /C "%INSTALL_BASE%%PACKAGE_NAME%" "%INSTALL_DEST%\%PACKAGE_NAME%" > .result
+set /P XTOOLRC= < .result
+del /Q /F .result
+
+xtool msg -qt MB_OK -i ? "Istallation finished" "%INSTALL_DESC% installed in##%INSTALL_DEST%\%PACKAGE_NAME%##%XTOOLRC%"
+
+:cmdEnd
+echo Finished %INSTALL_PROG% %DATE% %TIME%
+exit %RETVAL%
Property changes on: trunk/build/install/installer/installers/jbossas/_install/install.bat
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/build/install/installer/installers/jbossas/_install/jbosstop.png
===================================================================
(Binary files differ)
Property changes on: trunk/build/install/installer/installers/jbossas/_install/jbosstop.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/build/install/installer/installers/jbossas/_install/redhat16.png
===================================================================
(Binary files differ)
Property changes on: trunk/build/install/installer/installers/jbossas/_install/redhat16.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
16 years, 9 months
JBoss Native SVN: r1532 - trunk/build/install/xtool.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 06:47:57 -0400 (Tue, 08 Apr 2008)
New Revision: 1532
Modified:
trunk/build/install/xtool/xtool.c
Log:
Use ## as new line delimiters
Modified: trunk/build/install/xtool/xtool.c
===================================================================
--- trunk/build/install/xtool/xtool.c 2008-04-08 10:46:58 UTC (rev 1531)
+++ trunk/build/install/xtool/xtool.c 2008-04-08 10:47:57 UTC (rev 1532)
@@ -2940,11 +2940,11 @@
bi.hwndOwner = hWnd;
bi.ulFlags = iFlags;
bi.pidlRoot = il;
-
if ((ir = SHBrowseForFolder(&bi)) != NULL) {
SHGetPathFromIDList(ir, szPath);
rv = TRUE;
}
+
if (SHGetMalloc(&pMalloc)) {
pMalloc->lpVtbl->Free(pMalloc, il);
pMalloc->lpVtbl->Release(pMalloc);
@@ -5172,11 +5172,11 @@
argc -= optind;
argv += optind;
if (argc < 2) {
- return prog_rmdir_usage(EINVAL);
+ return prog_msg_usage(EINVAL);
}
msg = x_strdup(argv[1]);
for (p = msg; *p; p++) {
- if (*p == '\\' && *(p + 1) == 'n') {
+ if (*p == '#' && *(p + 1) == '#') {
*(p++) = '\r';
*(p++) = '\n';
}
@@ -5470,11 +5470,12 @@
}
msg = x_strdup(argv[0]);
for (p = msg; *p; p++) {
- if (*p == '\\' && *(p + 1) == 'n') {
+ if (*p == '#' && *(p + 1) == '#') {
*(p++) = '\r';
*(p++) = '\n';
}
}
+
if (GuiBrowseForFolder(HWND_DESKTOP, msg, path, flags)) {
fputs(path, stdout);
}
16 years, 9 months
JBoss Native SVN: r1531 - trunk/build/install/installer.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2008-04-08 06:46:58 -0400 (Tue, 08 Apr 2008)
New Revision: 1531
Modified:
trunk/build/install/installer/main.c
Log:
Wait for the installer to finish
Modified: trunk/build/install/installer/main.c
===================================================================
--- trunk/build/install/installer/main.c 2008-04-07 15:43:50 UTC (rev 1530)
+++ trunk/build/install/installer/main.c 2008-04-08 10:46:58 UTC (rev 1531)
@@ -1165,7 +1165,7 @@
dwHtmlHeight = (DWORD)atoi(optarg);
break;
case 'u':
- bMakeTemp = FALSE;
+ bMakeTemp = !bMakeTemp;
break;
case 'x':
bRunScript = TRUE;
@@ -1232,7 +1232,7 @@
}
if (bShowSplash) {
ShowSplash("/HTML_SPLASH", dwSplTimeout);
-
+ Sleep(200);
}
/* Standard Install */
@@ -1319,6 +1319,7 @@
szDest,
NULL);
if (RunChildProcess(szCmdExe, szCmdLine, szWorkDir, &prInfo)) {
+ WaitForSingleObject(prInfo.hProcess, INFINITE);
r = 0;
}
else
16 years, 9 months