1. Changed jsharp files to java files
2. Added CommandLauncher to allow java classes to be invoked from msi install
This commit is contained in:
Greg Richardson
@@ -24,40 +24,48 @@ SUBDIRS =
|
||||
|
||||
DIST_SUBDIRS =
|
||||
|
||||
EXTRA_DIST = SetupAsWindowsService.vjsproj Program.jsl
|
||||
EXTRA_DIST = SetupAsWindowsService.java
|
||||
|
||||
if DEBUG
|
||||
TARGET_CFG = Debug
|
||||
DEBUG = -g
|
||||
else
|
||||
TARGET_CFG = Release
|
||||
DEBUG = -g:none
|
||||
endif
|
||||
|
||||
PACKAGE = SetupAsWindowsService
|
||||
TARGET_FILE = $(PACKAGE).exe
|
||||
TARGET_FILE = $(PACKAGE).class
|
||||
LOG_FILE = $(PACKAGE).log
|
||||
JAVAFILES = SetupAsWindowsService.java
|
||||
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
|
||||
BUILDDIR = bin/$(TARGET_CFG)
|
||||
|
||||
.PHONY: package package-clean package-install package-uninstall devenv
|
||||
.PHONY: package package-clean package-install package-uninstall
|
||||
|
||||
package: $(TARGET_FILE)
|
||||
all: $(BUILDDIR) $(CLASSES)
|
||||
|
||||
devenv:
|
||||
@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
|
||||
|
||||
$(TARGET_FILE): devenv
|
||||
$(BUILDDIR)/%.class: %.java
|
||||
@rm -f $(LOG_FILE) $@
|
||||
@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
|
||||
echo $$CMD; \
|
||||
@echo [======== Compiling $@ ========]
|
||||
@javac $(DEBUG) -d $(BUILDDIR) $< 2> $(LOG_FILE)
|
||||
@echo $$CMD; \
|
||||
if eval $$CMD; then \
|
||||
ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \
|
||||
ls -l $(BUILDDIR)/$(TARGET_FILE); \
|
||||
cp $(BUILDDIR)/$(TARGET_FILE) bin; \
|
||||
else \
|
||||
grep -a "ERROR:" $(LOG_FILE); \
|
||||
fi
|
||||
|
||||
$(BUILDDIR):
|
||||
[ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR)
|
||||
|
||||
|
||||
package-clean clean-local:
|
||||
rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo
|
||||
rm -rf bin/Release/* bin/Release bin/Debug/* bin/Debug bin/* bin *.log
|
||||
|
||||
clean:
|
||||
rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo
|
||||
rm -rf bin/Release/* bin/Release bin/Debug/* bin/Debug bin/* bin *.log
|
||||
|
||||
distclean-local: package-clean
|
||||
rm -f Makefile
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
import System.Reflection.*;
|
||||
import System.Runtime.CompilerServices.*;
|
||||
import System.Runtime.InteropServices.*;
|
||||
|
||||
//
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
//
|
||||
|
||||
/** @assembly AssemblyTitle("SetupAsWindowsService") */
|
||||
/** @assembly AssemblyDescription("") */
|
||||
/** @assembly AssemblyCompany("Novell") */
|
||||
/** @assembly AssemblyProduct("SetupAsWindowsService") */
|
||||
/** @assembly AssemblyCopyright("Copyright © Novell 2007") */
|
||||
/** @assembly AssemblyTrademark("") */
|
||||
/** @assembly AssemblyCulture("") */
|
||||
|
||||
|
||||
// The ComVisible attribute controls accessibility of an individual type
|
||||
// or member, or of all types within this assembly, from COM. To access
|
||||
// a type or member in this assembly from COM, set the ComVisible attribute
|
||||
// on that type or member to true.
|
||||
/** @assembly ComVisible(false) */
|
||||
|
||||
|
||||
//
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
|
||||
/** @assembly AssemblyVersion("1.0.0.0") */
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,43 +0,0 @@
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>8.0.50727</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>SetupAsWindowsService</RootNamespace>
|
||||
<AssemblyName>SetupAsWindowsService</AssemblyName>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.jsl" />
|
||||
<Compile Include="Properties\AssemblyInfo.jsl" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.VisualJSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
Reference in New Issue
Block a user