Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 144303 Details for
Bug 182085
Remove dependency of AC packaging on tptpdc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Add packing steps to AC native build
182085_ac_add_packing.txt (text/plain), 19.47 KB, created by
Joshua Bowles
on 2009-08-12 16:21:12 EDT
(
hide
)
Description:
Add packing steps to AC native build
Filename:
MIME Type:
Creator:
Joshua Bowles
Created:
2009-08-12 16:21:12 EDT
Size:
19.47 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.tptp.platform.agentcontroller >Index: src-native-new/makefile.win_em64t >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/makefile.win_em64t,v >retrieving revision 1.16 >diff -u -r1.16 makefile.win_em64t >--- src-native-new/makefile.win_em64t 12 Nov 2007 22:05:51 -0000 1.16 >+++ src-native-new/makefile.win_em64t 12 Aug 2009 20:11:01 -0000 >@@ -38,33 +38,44 @@ > > > package: >- if exist packaging rm -rf packaging >- md packaging\bin >- md packaging\lib >+ REM Add files that appear in the SDK only first, runtime files can be added after agntctrl.base.zip is created. >+ if not exist packaging\bin md packaging\bin >+ if not exist packaging\lib md packaging\lib > md packaging\config > md packaging\agents > md packaging\about_files >+ >+ REM Remove unwanted SWT files that were added by add-dependancies.agntctrl.sh when swt.jar was copied over >+ rm -rf packaging/swt_licenses packaging/bin/swt* > > if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin > copy /y bin\*.dll packaging\bin > copy /y bin\readme.txt packaging\bin >- if exist $(TEMP_LICENSE_HOME)\epl-v10.html copy /y $(TEMP_LICENSE_HOME)\epl-v10.html packaging >- if exist $(TEMP_LICENSE_HOME)\notice.html copy /y $(TEMP_LICENSE_HOME)\notice.html packaging > if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin > xcopy /y /E config packaging\config > xcopy /y /E agents packaging\agents > copy /y about.win.html packaging\about.html > xcopy /y /E about_files packaging\about_files > >+ REM Create agntctrl.base.zip which will become the SDK after adding include and samples folders >+ REM Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime. > if exist agntctrl.base.win_em64t.zip rm -f agntctrl.base.win_em64t.zip > cd packaging >- zip -r9 ..\agntctrl.base.win_em64t.zip * >+ zip -r9 ..\agntctrl.base.win_em64t.zip * -x bin\/*.jar lib\/*.jar /plugins\/* > cd .. > >- rm -rf packaging >- md packaging\bin >+ REM Can now add runtime files that don't appear in the SDK >+ REM Files that were formally copied over from tptpdc >+ md packaging\Resources >+ md packaging\security >+ copy /y packaging_md\windows\book.css packaging >+ copy /y packaging_md\windows\getting_started.html packaging >+ copy /y packaging_md\windows\bin\SetConfig.bat packaging\bin >+ xcopy /y /E packaging_md\Resources packaging\Resources >+ xcopy /y /E packaging_md\security packaging\security > > copy /y bin\*.exe packaging\bin >+ REM Create copies of the ACServer and ACService files for backwards compatibility > copy /y bin\ACServer.exe packaging\bin\RAServer.exe > copy /y bin\ACWinService.exe packaging\bin\RAService.exe > >Index: src-native-new/makefile.win_ia32 >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/makefile.win_ia32,v >retrieving revision 1.29 >diff -u -r1.29 makefile.win_ia32 >--- src-native-new/makefile.win_ia32 12 Nov 2007 22:05:51 -0000 1.29 >+++ src-native-new/makefile.win_ia32 12 Aug 2009 20:11:01 -0000 >@@ -29,9 +29,9 @@ > cd ..\..\..\.. > > package: >- if exist packaging rm -rf packaging >- md packaging\bin >- md packaging\lib >+ REM Add files that appear in the SDK only first, runtime files can be added after agntctrl.base.zip is created. >+ if not exist packaging\bin md packaging\bin >+ if not exist packaging\lib md packaging\lib > md packaging\config > md packaging\agents > md packaging\about_files >@@ -39,23 +39,32 @@ > if exist $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll copy /y $(CBE_SDK_HOME)\lib\CommonBaseEvent.dll packaging\bin > copy /y bin\*.dll packaging\bin > copy /y bin\readme.txt packaging\bin >- if exist $(TEMP_LICENSE_HOME)\epl-v10.html copy /y $(TEMP_LICENSE_HOME)\epl-v10.html packaging >- if exist $(TEMP_LICENSE_HOME)\notice.html copy /y $(TEMP_LICENSE_HOME)\notice.html packaging > if exist $(XERCESC_HOME)\bin\xerces-c_2_6.dll copy /y $(XERCESC_HOME)\bin\xerces-c_2_6.dll packaging\bin > xcopy /y /E config packaging\config > xcopy /y /E agents packaging\agents > copy /y about.win.html packaging\about.html > xcopy /y /E about_files packaging\about_files > >+ REM Create agntctrl.base.zip which will become the SDK after adding include and samples folders >+ REM Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime. > if exist agntctrl.base.win_ia32.zip rm -f agntctrl.base.win_ia32.zip > cd packaging >- zip -r9 ..\agntctrl.base.win_ia32.zip * >+ zip -r9 ..\agntctrl.base.win_ia32.zip * -x bin\/*.jar lib\/*.jar /plugins\/* /swt_licenses\/* /bin\/swt* > cd .. > >- rm -rf packaging >- md packaging\bin >+ REM Can now add runtime files that don't appear in the SDK >+ REM Files that were formally copied over from tptpdc >+ md packaging\Resources >+ md packaging\security >+ copy /y packaging_md\windows\book.css packaging >+ copy /y packaging_md\windows\getting_started.html packaging >+ copy /y packaging_md\windows\bin\SetConfig.bat packaging\bin >+ xcopy /y /E packaging_md\Resources packaging\Resources >+ xcopy /y /E packaging_md\security packaging\security > > copy /y bin\*.exe packaging\bin >+ >+ REM Create copies of the ACServer and ACService files for backwards compatibility > copy /y bin\ACServer.exe packaging\bin\RAServer.exe > copy /y bin\ACWinService.exe packaging\bin\RAService.exe > >Index: src-native-new/makefile >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/makefile,v >retrieving revision 1.59 >diff -u -r1.59 makefile >--- src-native-new/makefile 14 Jul 2009 18:13:21 -0000 1.59 >+++ src-native-new/makefile 12 Aug 2009 20:11:01 -0000 >@@ -76,17 +76,17 @@ > cd .. > > package: >- rm -rf packaging >+# Note about the packing process. Only files that should appear in the SDK should be added here. Runtime files should be added after creating agntctrl.base.$(BUILD_PLATFORM).zip > mkdir -p packaging/bin > mkdir -p packaging/lib >+ >+ if [ -e packaging_md/plugins ]; then cp -r packaging_md/plugins packaging; \ >+ fi; >+ > if [ -e ${CBE_SDK_HOME}/lib/libcbe.so ]; then cp ${CBE_SDK_HOME}/lib/libcbe.so packaging/lib; \ > fi; >- if [ -e ${TEMP_LICENSE_HOME}/epl-v10.html ]; then cp ${TEMP_LICENSE_HOME}/epl-v10.html packaging; \ >- fi; >- if [ -e ${TEMP_LICENSE_HOME}/notice.html ]; then cp ${TEMP_LICENSE_HOME}/notice.html packaging; \ >- fi; > >-# Some Solaris systems are unable to copy symbolic links, to work arround this, the files are zipped up and unzipped into the correct location. >+# Some Solaris systems are unable to copy symbolic links, to work around this, the files are zipped up and unzipped into the correct location. > ifeq ($(UNAME), SunOS) > zip -qjy tmp.zip lib/lib* > unzip -q tmp.zip -d packaging/lib >@@ -113,13 +113,19 @@ > if [ -e packaging/lib/libperflin.so ]; then rm -f packaging/lib/libperflin.*; fi; > if [ -e packaging/lib/librac.so ]; then rm -f packaging/lib/librac.*; fi; > >+# Create agntctrl.base.zip which will become the SDK after adding include and samples folders >+# Certain files will have to be excluded as they should only be in the runtime but had to be added before creating the runtime. > rm -f agntctrl.base.$(BUILD_PLATFORM).zip > cd packaging; \ >- zip -r9y ../agntctrl.base.$(BUILD_PLATFORM).zip *; \ >+ zip -r9y ../agntctrl.base.$(BUILD_PLATFORM).zip * -x bin/*.jar lib/*.jar /plugins/* /swt_licenses/* lib/libswt*; \ > cd .. >- >- rm -rf packaging >- mkdir -p packaging/bin >+ >+# Files that will appear only in the runtime and not the SDK can now be added. >+# Copy about files into packaged zips. >+ cp packaging_md/linux/getting_started.html packaging >+ cp packaging_md/linux/book.css packaging >+ cp -r packaging_md/Resources packaging >+ cp -r packaging_md/security packaging > > # Some Solaris systems are unable to copy symbolic links, to work arround this, the files are zipped up and unzipped into the correct location. > ifeq ($(UNAME), SunOS) >@@ -139,8 +145,21 @@ > > rm -f packaging/bin/ACStart-aix.sh packaging/bin/ACStop-aix.sh > >- # TODO: localize the packaging process by performing symlinking and other final packaging steps here >- >+# Create the symbolic links in the bin directory for RA* versions of the AC* files >+# Links are created in the current directory then moved due since "cd packaging/bin; ln -s ./ACStart.sh RAStart.sh" doesn't create the links in packaging/bin for some reason. >+ cp packaging/bin/ACServer packaging/bin/RAServer >+ ln -s ./ACStart.sh RAStart.sh >+ ln -s ./ACStop.sh RAStop.sh >+ mv RAS* packaging/bin >+ >+# Add the SetConfig.sh to bin >+ cp packaging_md/linux/bin/SetConfig.sh packaging/bin >+ >+# Remove swt libraries and licenses from non ia32 platforms >+ifneq ($(BUILD_PLATFORM), linux_ia32) >+ rm -rf packaging/swt_licenses packaging/lib/libswt* >+endif >+ > cp agntctrl.base.$(BUILD_PLATFORM).zip agntctrl.$(BUILD_PLATFORM).zip > cd packaging; \ > zip -ur9y ../agntctrl.$(BUILD_PLATFORM).zip *; \ >Index: src-native-new/packaging_md/security/generateKey.sh >=================================================================== >RCS file: src-native-new/packaging_md/security/generateKey.sh >diff -N src-native-new/packaging_md/security/generateKey.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/security/generateKey.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,11 @@ >+#!/bin/sh >+KEYTOOL=keytool >+CERT=tptpSample.cer >+KEYSTORE=tptpSamplekeystore >+PASSWORD=password >+ >+rm -f $CERT >+rm -f $KEYSTORE >+ >+$KEYTOOL -genkey -alias sample -keyalg RSA -sigalg MD5withRSA -dname "CN=Sample, OU=Sample, O=Sample, C=US" -validity 3650 -keypass $PASSWORD -storetype jks -keystore $KEYSTORE -storepass $PASSWORD >+$KEYTOOL -export -alias sample -file $CERT -keystore $KEYSTORE -storepass $PASSWORD >Index: src-native-new/packaging_md/linux/bin/SetConfig.sh >=================================================================== >RCS file: src-native-new/packaging_md/linux/bin/SetConfig.sh >diff -N src-native-new/packaging_md/linux/bin/SetConfig.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/linux/bin/SetConfig.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,72 @@ >+#!/bin/sh >+ >+# >+# Check if java is in the PATH >+# >+java -version > /dev/null 2>&1 >+if [ $? != 0 ]; then >+ echo 'ERROR: Cannot find java in the PATH' >+ echo 'RESOLUTION: Make sure the PATH environment variable contains the location of a java executable' >+ exit 0 >+fi >+ >+ >+if [ ! -s ../lib/config.jar ]; then >+ echo 'ERROR: Cannot find ..\lib\config.jar.' >+ echo 'RESOLUTION: Make sure you are running this script in <AC>/bin directory.' >+ exit 0 >+fi >+ >+# >+# Check for com.ibm.icu in any /eclipse/plugins folders on the path >+# >+path_elements=`pwd | sed "s:/: :g"` >+dir_path="" >+for dir in $path_elements >+do >+ if [ -s $dir_path/$dir/plugins/com.ibm.icu_* ] >+ then >+ icu_prefix=$dir_path/$dir/plugins >+ icu_name=`ls $icu_prefix | grep "com.ibm.icu_"` >+ break >+ else >+ dir_path=$dir_path/$dir >+ fi >+done >+ >+if [ ! $icu_prefix ] >+then >+ echo 'ERROR: Cannot find com.ibm.icu_<date>.jar.' >+ echo 'RESOLUTION: Make sure you are running this script in <AC>/bin directory and that com.ibm.icu.<date>.jar exists.' >+ exit 0 >+fi >+ >+# >+# Check if the JRE contains a suitable JAXP >+# >+java -classpath $icu_prefix/$icu_name:../lib/config.jar org.eclipse.tptp.platform.agentcontroller.config.TestJAXP > /dev/null 2>&1 >+if [ $? != 0 ]; then >+ echo 'ERROR: The Java Runtime in use does not contain a suitable JAXP feature' >+ echo 'RESOLUTION: Use a JRE which supports the JAXP feature' >+ exit 0 >+fi >+ >+# >+# Generate the configuration files >+# >+java -classpath $icu_prefix/$icu_name:../lib/config.jar:../lib/config.nl1.jar:../lib/config.nl2.jar:../lib/config.nl2a.jar org.eclipse.tptp.platform.agentcontroller.config.SetConfig $* >+ >+# >+# Change the owner of ChkPass so that Agent Controller does not need root access for authenticating user passwords >+# >+RAC_SECURED=`grep -c '<Security ' ../config/serviceconfig.xml` >+AC_SECURED=`grep -c '<SecurityEnabled>true' ../config/serviceconfig.xml` >+SECURED=`expr $RAC_SECURED + $AC_SECURED` >+if [ $SECURED = "0" ]; then >+ echo >+else >+ echo >+ echo 'Agent Controller has been configured for security.' >+ echo 'Please enter root password to enable that security:' >+ su root -c "chown root ChkPass;chmod +s ChkPass" >+fi >Index: src-native-new/packaging_md/security/generateKey.bat >=================================================================== >RCS file: src-native-new/packaging_md/security/generateKey.bat >diff -N src-native-new/packaging_md/security/generateKey.bat >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/security/generateKey.bat 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,24 @@ >+@rem ********************************************************************* >+@rem Copyright (c) 2006, 2008 IBM Corporation and others. >+@rem All rights reserved. This program and the accompanying materials >+@rem are made available under the terms of the Eclipse Public License v1.0 >+@rem which accompanies this distribution, and is available at >+@rem http://www.eclipse.org/legal/epl-v10.html >+@rem $Id: generateKey.bat,v 1.2 2008/02/29 14:23:39 jkubasta Exp $ >+@rem >+@rem Contributors: >+@rem IBM - Initial API and implementation >+@rem ********************************************************************* >+@rem >+@setlocal >+@set KEYTOOL=keytool >+@set CERT=tptpSample.cer >+@set KEYSTORE=tptpSamplekeystore >+@set PASSWORD=password >+ >+@del /f %CERT% >+@del /f %KEYSTORE% >+ >+%KEYTOOL% -genkey -alias sample -keyalg RSA -sigalg MD5withRSA -dname "CN=Sample, OU=Sample, O=Sample, C=US" -validity 3650 -keypass %PASSWORD% -storetype jks -keystore %KEYSTORE% -storepass %PASSWORD% >+%KEYTOOL% -export -alias sample -file %CERT% -keystore %KEYSTORE% -storepass %PASSWORD% >+@endlocal >Index: src-native-new/packaging_md/windows/bin/SetConfig.bat >=================================================================== >RCS file: src-native-new/packaging_md/windows/bin/SetConfig.bat >diff -N src-native-new/packaging_md/windows/bin/SetConfig.bat >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/windows/bin/SetConfig.bat 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,79 @@ >+@rem ********************************************************************* >+@rem Copyright (c) 2005, 2009 IBM Corporation and others. >+@rem All rights reserved. This program and the accompanying materials >+@rem are made available under the terms of the Eclipse Public License v1.0 >+@rem which accompanies this distribution, and is available at >+@rem http://www.eclipse.org/legal/epl-v10.html >+@rem $Id: SetConfig.bat,v 1.10 2009/04/17 01:34:10 jcayne Exp $ >+@rem >+@rem Contributors: >+@rem IBM - Initial API and implementation >+@rem ********************************************************************* >+@rem >+@REM >+@REM Check if java is in the PATH >+@REM >+@java -version > nul 2>&1 >+@IF ERRORLEVEL 1 GOTO ERROR_JAVA_NOT_FOUND >+ >+@REM >+@REM Check if the script is run in <AC>/bin directory. >+@REM >+@if not exist ..\lib\config.jar GOTO ERROR_CONFIG_NOT_FOUND >+ >+ >+@REM >+@REM Find com.ibm.icu_<date>.jar if it's under an eclipse/plugins folder shared by the working dir. >+@REM >+ >+@SET PREV_DIR=%CD% >+@PUSHD .. >+ >+:DIR_SEARCH >+@if exist plugins\com.ibm.icu_* ( >+CD plugins >+@SET PREFIX=%CD%\plugins >+@FOR /F "tokens=*" %%G IN ('DIR /b com.ibm.icu_*') DO @SET JAR_NAME=%%G >+@POPD >+@GOTO ASSIGN_CLASS >+) >+@CD .. >+@IF "%CD%" EQU "%PREV_DIR%" ( >+@POPD >+@GOTO DIR_SEARCH_ERROR >+) >+@SET PREV_DIR=%CD% >+@GOTO DIR_SEARCH >+ >+:ASSIGN_CLASS >+@REM Check if the JRE contains a suitable JAXP >+@java -classpath "%PREFIX%"\%JAR_NAME%;..\lib\config.jar org.eclipse.tptp.platform.agentcontroller.config.TestJAXP > nul 2>&1 >+@IF ERRORLEVEL 1 GOTO ERROR_JAXP_NOT_SUPPORTED >+ >+@REM >+@REM Generate the configuration files >+@REM >+@java -classpath "%PREFIX%"\%JAR_NAME%;..\lib\config.jar;..\lib\config.nl1.jar;..\lib\config.nl2.jar;..\lib\config.nl2a.jar org.eclipse.tptp.platform.agentcontroller.config.SetConfig %* >+@goto END >+ >+:ERROR_JAVA_NOT_FOUND >+@echo "ERROR: Cannot find java in the PATH" >+@echo "RESOLUTION: Make sure the PATH environment variable contains the location of a java executable" >+@goto END >+ >+:ERROR_CONFIG_NOT_FOUND >+@echo "ERROR: Cannot find ..\lib\config.jar." >+@echo "RESOLUTION: Make sure you are running this script in <AC>/bin directory." >+@goto END >+ >+:ERROR_JAXP_NOT_SUPPORTED >+@echo "ERROR: The Java Runtime in use does not contain a suitable JAXP feature" >+@echo "RESOLUTION: Use a JRE which supports the JAXP feature" >+@goto END >+ >+:DIR_SEARCH_ERROR >+@ECHO "ERROR: Cannot find com.ibm.icu_<date>.jar." >+@ECHO "RESOLUTION: Make sure you are running this script in <AC>/bin directory and that com.ibm.icu.<date>.jar exists in a eclipse/plugins dir higer than current dir." >+@GOTO END >+ >+:END >Index: src-native-new/packaging_md/Resources/filters.txt >=================================================================== >RCS file: src-native-new/packaging_md/Resources/filters.txt >diff -N src-native-new/packaging_md/Resources/filters.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/Resources/filters.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,9 @@ >+java* * EXCLUDE >+sun* * EXCLUDE >+com.sun.* * EXCLUDE >+com.ibm.* * EXCLUDE >+org.eclipse.* * EXCLUDE >+org.apache.* * EXCLUDE >+org.w3c.* * EXCLUDE >+org.xml.* * EXCLUDE >+javax.xml.parsers.* * EXCLUDE >Index: src-native-new/packaging_md/Resources/jvmpi.pro >=================================================================== >RCS file: src-native-new/packaging_md/Resources/jvmpi.pro >diff -N src-native-new/packaging_md/Resources/jvmpi.pro >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/packaging_md/Resources/jvmpi.pro 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,37 @@ >+* >+* This is the profile file for the JvmPI Agent >+* Use this file to control the information content that is collected >+* All lines starting with an "*" are comment lines >+* >+* >+************************************************************************************************************************************ >+* Global Options >+* These options must be set at Agent startup before any tracing has begun. >+* Please refer to \logging\agents\profiling_agent\doc\JvmProfilingAgent.htm for details. >+************************************************************************************************************************************ >+ >+ >+********************************** >+* Global Options - DEFAULT VALUE >+********************************** >+CLASS_LOAD_DETAILS = false >+CONTEXT_FLOW = false >+EXCEPTION_TRACING = false >+FILTERS = true >+GC = default >+ID_STYLE = static >+OPTIONS = true >+TIMESTAMPS = true >+UNREFERENCED_SYMBOLS = false >+ >+*********************************** >+* Global Options - INTERFACE VALUE >+*********************************** >+ >+COLLATION_VALUES = false >+METHOD_COUNTS = false >+OBJ_ALLOC_IS_ARRAY = true >+OBJ_REF_MODE = filterOwner >+STACK_INFORMATION = contiguous >+TICKET = true >+TRACE_IDREFS = false
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 182085
:
144239
|
144245
| 144303 |
144427
|
144463
|
144478