Mercurial > hg > thermostat
changeset 2547:ab494110bf67
Fix for RPM build (part 2)
add dependencies to thermostat.spec, clean up makefile
Reviewed by: sgehwolf
Review thread: http://icedtea.classpath.org/pipermail/thermostat/2016-December/021842.html
| author | stooke@DESKTOP-GO0RAHB.yyz.redhat.com. |
|---|---|
| date | Fri, 09 Dec 2016 14:11:16 -0500 |
| parents | 26055a3e53dd |
| children | f198b30beb47 |
| files | agent/core/Makefile distribution/packaging/fedora/thermostat.spec |
| diffstat | 2 files changed, 24 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/core/Makefile Fri Dec 09 09:57:09 2016 -0500 +++ b/agent/core/Makefile Fri Dec 09 14:11:16 2016 -0500 @@ -1,22 +1,22 @@ CC = gcc JAVAH = javah -MYCFLAGS = -c -Wall -fPIC $(EXTRA_CFLAGS) -MYLDFLAGS = -fPIC -shared $(EXTRA_CFLAGS) +MYCFLAGS = -c -Wall $(EXTRA_CFLAGS) +MYLDFLAGS = -shared $(EXTRA_CFLAGS) COPY = cp -a CLASSPATH = target/classes/ TARGET_DIR = target -ifeq ($(OS),Linux) +ifeq ($(OS),Windows_NT) + JNI_PLATFORM = win32 + SO_PREFIX = + SO_SUFFIX = .dll +else JNI_PLATFORM = linux SO_PREFIX = lib SO_SUFFIX = .so MYCFLAGS += -fPIC MYLDFLAGS += -fPIC -else - JNI_PLATFORM = win32 - SO_PREFIX = - SO_SUFFIX = .dll endif INCLUDE = -I $(TARGET_DIR) -I "$(JAVA_HOME)/include/" -I "$(JAVA_HOME)/include/$(JNI_PLATFORM)" @@ -38,15 +38,14 @@ EXECUTABLES = $(HOSTNAME_EXECUTABLE) $(USERNAME_EXECUTABLE) -ifeq ($(OS),Windows_NT) - EXECUTABLES += $(WINHELPER_EXECUTABLE) -endif - - .PHONY: JNI_LIST = com.redhat.thermostat.agent.utils.hostname.HostName\ - com.redhat.thermostat.utils.username.internal.UserNameUtilImpl\ - com.redhat.thermostat.agent.utils.windows.WindowsHelperImpl + com.redhat.thermostat.utils.username.internal.UserNameUtilImpl + +ifeq ($(OS),Windows_NT) + EXECUTABLES += $(WINHELPER_EXECUTABLE) + JNI_LIST += com.redhat.thermostat.agent.utils.windows.WindowsHelperImpl +endif $(JNI_LIST): $(JAVAH) -force -classpath $(CLASSPATH) -d $(TARGET_DIR) $(JNI_LIST) @@ -60,13 +59,13 @@ $(COPY) $(WINHELPER_SOURCES) $(WINHELPER_TARGET) $(HOSTNAME_EXECUTABLE): $(HOSTNAME_OBJECTS) - $(CC) $(HOSTNAME_OBJECTS) -o $(TARGET_DIR)/$@ $(MYLDFLAGS) $(LDFLAGS) $(PLATFORM_LIBS) + $(CC) $(MYLDFLAGS) $(LDFLAGS) $(HOSTNAME_OBJECTS) $(PLATFORM_LIBS) -o $(TARGET_DIR)/$@ $(USERNAME_EXECUTABLE): $(USERNAME_OBJECTS) - $(CC) $(USERNAME_OBJECTS) -o $(TARGET_DIR)/$@ $(MYLDFLAGS) $(LDFLAGS) $(PLATFORM_LIBS) + $(CC) $(MYLDFLAGS) $(LDFLAGS) $(USERNAME_OBJECTS) $(PLATFORM_LIBS) -o $(TARGET_DIR)/$@ $(WINHELPER_EXECUTABLE): $(WINHELPER_OBJECTS) - $(CC) $(WINHELPER_OBJECTS) -o $(TARGET_DIR)/$@ $(MYLDFLAGS) $(LDFLAGS) $(PLATFORM_LIBS) -l psapi + $(CC) $(MYLDFLAGS) $(LDFLAGS) $(WINHELPER_OBJECTS) $(PLATFORM_LIBS) -l psapi -o $(TARGET_DIR)/$@ .c.o: $(CC) $(MYCFLAGS) $(CFLAGS) $(INCLUDE) $< -o $@
--- a/distribution/packaging/fedora/thermostat.spec Fri Dec 09 09:57:09 2016 -0500 +++ b/distribution/packaging/fedora/thermostat.spec Fri Dec 09 14:11:16 2016 -0500 @@ -691,12 +691,19 @@ -cp ../annotations/target/classes \ src/main/java/com/redhat/thermostat/shared/config/NativeLibraryResolver.java \ src/main/java/com/redhat/thermostat/shared/config/CommonPaths.java \ + src/main/java/com/redhat/thermostat/shared/config/OS.java \ src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java \ src/main/java/com/redhat/thermostat/shared/config/InvalidConfigurationException.java \ src/main/java/com/redhat/thermostat/shared/locale/Translate.java \ src/main/java/com/redhat/thermostat/shared/locale/LocalizedString.java \ src/main/java/com/redhat/thermostat/shared/locale/internal/LocaleResources.java popd +pushd common/core + mkdir -p target/classes + javac -d target/classes -cp ../../annotations/target/classes:../../config/target/classes \ + src/main/java/com/redhat/thermostat/common/internal/LocaleResources.java \ + src/main/java/com/redhat/thermostat/common/utils/LoggingUtils.java +popd pushd keyring mkdir -p target/classes javac -cp ../config/target/classes:../annotations/target/classes \ @@ -710,7 +717,7 @@ popd pushd agent/core mkdir -p target/classes - javac -cp ../../config/target/classes:../../annotations/target/classes \ + javac -cp ../../config/target/classes:../../annotations/target/classes:../../common/core/target/classes \ -d target/classes \ src/main/java/com/redhat/thermostat/agent/utils/hostname/HostName.java \ src/main/java/com/redhat/thermostat/agent/utils/username/UserNameUtil.java \