Upgrade to launch4j 3.0.1 2008-07-20.
The license is BSD for launch4j and MIT for the wrapper code in head/ Changelog is in installer/lib/launch4j/web/changelog.html Hopefully this will fix installs for 64-bit JRE on 64-bit windows. The previous version was 2.0-RC3 2005-08-13. The previous license was GPLv2 for launch4j and LGPLv2.1 for the wrapper code in head/ The bin/ld.exe and bin/windres.exe files were contributed by i2p users in 2005 so the i2p installer could be built on windows. They have not been updated for 3.0.1, so pkg builds on windows will presumably still get 2.0-RC3.
This commit is contained in:
@ -5,11 +5,11 @@ CPP = g++.exe
|
||||
CC = gcc.exe
|
||||
WINDRES = windres.exe
|
||||
RES =
|
||||
OBJ = consolehead.o ../head.o $(RES)
|
||||
LINKOBJ = consolehead.o ../head.o $(RES)
|
||||
LIBS = -L"lib" -s
|
||||
INCS = -I"include"
|
||||
CXXINCS = -I"lib/gcc/mingw32/3.4.2/include" -I"include/c++/3.4.2/backward" -I"include/c++/3.4.2/mingw32" -I"include/c++/3.4.2" -I"include"
|
||||
OBJ = ../../head/consolehead.o ../../head/head.o $(RES)
|
||||
LINKOBJ = ../../head/consolehead.o ../../head/head.o $(RES)
|
||||
LIBS = -L"C:/Dev-Cpp/lib" -n -s
|
||||
INCS = -I"C:/Dev-Cpp/include"
|
||||
CXXINCS = -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"C:/Dev-Cpp/include/c++/3.4.2/backward" -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32" -I"C:/Dev-Cpp/include/c++/3.4.2" -I"C:/Dev-Cpp/include"
|
||||
BIN = consolehead.exe
|
||||
CXXFLAGS = $(CXXINCS) -fexpensive-optimizations -O3
|
||||
CFLAGS = $(INCS) -fexpensive-optimizations -O3
|
||||
@ -24,10 +24,10 @@ clean: clean-custom
|
||||
${RM} $(OBJ) $(BIN)
|
||||
|
||||
$(BIN): $(OBJ)
|
||||
$(CC) $(LINKOBJ) -o "consolehead.exe" $(LIBS)
|
||||
# $(CC) $(LINKOBJ) -o "consolehead.exe" $(LIBS)
|
||||
|
||||
consolehead.o: consolehead.c
|
||||
$(CC) -c consolehead.c -o consolehead.o $(CFLAGS)
|
||||
../../head/consolehead.o: consolehead.c
|
||||
$(CC) -c consolehead.c -o ../../head/consolehead.o $(CFLAGS)
|
||||
|
||||
../head.o: ../head.c
|
||||
$(CC) -c ../head.c -o ../head.o $(CFLAGS)
|
||||
../../head/head.o: ../head.c
|
||||
$(CC) -c ../head.c -o ../../head/head.o $(CFLAGS)
|
||||
|
||||
@ -1,24 +1,30 @@
|
||||
/*
|
||||
Launch4j (http://launch4j.sourceforge.net/)
|
||||
Cross-platform Java application wrapper for creating Windows native executables.
|
||||
|
||||
launch4j :: Cross-platform Java application wrapper for creating Windows native executables
|
||||
Copyright (C) 2004-2005 Grzegorz Kowal
|
||||
Copyright (c) 2004, 2007 Grzegorz Kowal
|
||||
|
||||
Compiled with Mingw port of GCC, Bloodshed Dev-C++ IDE (http://www.bloodshed.net/devcpp.html)
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Except as contained in this notice, the name(s) of the above copyright holders
|
||||
shall not be used in advertising or otherwise to promote the sale, use or other
|
||||
dealings in this Software without prior written authorization.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "../resource.h"
|
||||
@ -27,29 +33,32 @@
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
setConsoleFlag();
|
||||
HMODULE hLibrary = NULL;
|
||||
char cmdLine[BIG_STR] = "";
|
||||
int i; // causes error: 'for' loop initial declaration used outside C99 mode.
|
||||
for (i = 1; i < argc; i++) {
|
||||
strcat(cmdLine, argv[i]);
|
||||
if (i < argc - 1) {
|
||||
strcat(cmdLine, " ");
|
||||
LPTSTR cmdLine = GetCommandLine();
|
||||
if (*cmdLine == '"') {
|
||||
if (*(cmdLine = strchr(cmdLine + 1, '"') + 1)) {
|
||||
cmdLine++;
|
||||
}
|
||||
} else if ((cmdLine = strchr(cmdLine, ' ')) != NULL) {
|
||||
cmdLine++;
|
||||
} else {
|
||||
cmdLine = "";
|
||||
}
|
||||
if (!prepare(hLibrary, cmdLine)) {
|
||||
if (hLibrary != NULL) {
|
||||
FreeLibrary(hLibrary);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
FreeLibrary(hLibrary);
|
||||
|
||||
int result = (int) execute(TRUE);
|
||||
if (result == -1) {
|
||||
char errMsg[BIG_STR] = "could not start the application: ";
|
||||
strcat(errMsg, strerror(errno));
|
||||
int result = prepare(cmdLine);
|
||||
if (result == ERROR_ALREADY_EXISTS) {
|
||||
char errMsg[BIG_STR] = {0};
|
||||
loadString(INSTANCE_ALREADY_EXISTS_MSG, errMsg);
|
||||
msgBox(errMsg);
|
||||
closeLogFile();
|
||||
return 2;
|
||||
}
|
||||
if (result != TRUE) {
|
||||
signalError();
|
||||
return 1;
|
||||
}
|
||||
|
||||
result = (int) execute(TRUE);
|
||||
if (result == -1) {
|
||||
signalError();
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -7,23 +7,23 @@ Ver=1
|
||||
ObjFiles=
|
||||
Includes=
|
||||
Libs=
|
||||
PrivateResource=consolehead_private.rc
|
||||
PrivateResource=
|
||||
ResourceIncludes=
|
||||
MakeIncludes=
|
||||
Compiler=
|
||||
CppCompiler=
|
||||
Linker=
|
||||
Linker=-n_@@_
|
||||
IsCpp=0
|
||||
Icon=
|
||||
ExeOutput=
|
||||
ObjectOutput=
|
||||
ObjectOutput=..\..\head
|
||||
OverrideOutput=0
|
||||
OverrideOutputName=consolehead.exe
|
||||
HostApplication=
|
||||
Folders=
|
||||
CommandLine=
|
||||
UseCustomMakefile=0
|
||||
CustomMakefile=
|
||||
CustomMakefile=Makefile.win
|
||||
IncludeVersionInfo=0
|
||||
SupportXPThemes=0
|
||||
CompilerSet=0
|
||||
|
||||
Reference in New Issue
Block a user