Further build script change

This commit is contained in:
Dick Fickling 2012-04-26 13:26:47 -04:00
parent 79616061f6
commit 3da17cddf0
10 changed files with 5127 additions and 60 deletions

View File

@ -1,20 +1,8 @@
CTL_KeywordSearchHistoryAction=Keyword Search History
CTL_KeywordSearchHistoryTopComponent=Keyword Search History Window
CTL_KeywordSearchListAction=Keyword List
CTL_KeywordSearchListImportExportAction=Keyword Lists
CTL_KeywordSearchListImportExportTopComponent=Keyword Lists Window
CTL_KeywordSearchListTopComponent=Keyword List
CTL_KeywordSearchTabsTopComponentAction=Keyword Search
CTL_KeywordSearchTabsTopComponentTopComponent=Keyword Search
HINT_KeywordSearchHistoryTopComponent=This is a Keyword Search History window
HINT_KeywordSearchListImportExportTopComponent=Keyword Search List Import Export window
HINT_KeywordSearchListTopComponent=Keyword Search List
HINT_KeywordSearchTabsTopComponentTopComponent=Keyword Search window
OpenIDE-Module-Name=KeywordSearch
ListBundleName=Keyword Lists
ListBundleConfig=Keyword List Configuration
IndexProgressPanel.statusText.text=Status text
IndexProgressPanel.cancelButton.text=Cancel
KeywordSearchTopComponent.filesIndexedNameLabel.AccessibleContext.accessibleName=Files indexed:
KeywordSearchTopComponent.filesIndexedValLabel.AccessibleContext.accessibleName=-
ExtractedContentPanel.hitLabel.text=Match:
ExtractedContentPanel.hitCountLabel.text=-
ExtractedContentPanel.hitOfLabel.text=of
@ -22,45 +10,8 @@ ExtractedContentPanel.hitTotalLabel.text=-
ExtractedContentPanel.hitButtonsLabel.text=Match
ExtractedContentPanel.hitPreviousButton.text=
ExtractedContentPanel.hitNextButton.text=
KeywordSearchSimpleTopComponent.filesIndexedValLabel.text=-
KeywordSearchSimpleTopComponent.filesIndexedNameLabel.text=Files indexed:
KeywordSearchSimpleTopComponent.searchButton.text=Search
KeywordSearchListTopComponent.searchButton.text=Search
KeywordSearchListTopComponent.filesIndexedNameLabel.text=Files indexed:
KeywordSearchListTopComponent.filesIndexedValLabel.text=-
KeywordSearchListTopComponent.titleLabel.text=Search for a list of keywords
KeywordSearchListTopComponent.addWordButton.text=Add
KeywordSearchListTopComponent.loadListButton.text=Load List
KeywordSearchListTopComponent.addWordField.text=
KeywordSearchListTopComponent.saveListButton.text=Save List
KeywordSearchListTopComponent.deleteWordButton.text=Remove
KeywordSearchListTopComponent.deleteAllWordsButton.text=Remove All
KeywordSearchSimpleTopComponent.chRegex.text=Regular Expression
KeywordSearchListImportExportTopComponent.topLabel.text=Manage (import, export, delete) lists of keywords
KeywordSearchListImportExportTopComponent.importButton.text=Import
KeywordSearchListImportExportTopComponent.exportButton.text=Export
KeywordSearchListImportExportTopComponent.deleteButton.text=Delete
KeywordSearchListTopComponent.curListNameLabel.text=Loaded list:
KeywordSearchListTopComponent.curListValLabel.text=-
KeywordSearchListTopComponent.importButton.text=Import List
KeywordSearchHistoryTopComponent.topLabel.text=Review keyword search history and saved results
KeywordSearchHistoryTopComponent.filesIndexedNameLabel.text=Files indexed:
KeywordSearchHistoryTopComponent.filesIndexedValLabel.text=-
KeywordSearchHistoryTopComponent.withHitsLabel.text=Keyword searches with hits:
KeywordSearchHistoryTopComponent.noHitsLabel.text=Keyword searches without hits:
KeywordSearchSimpleTopComponent.queryTextField.text=
KeywordSearchListTopComponent.chRegex.text=Regular Expression
KeywordSearchSimpleTopComponent.titleLabel.text=Search for a single keyword
ExtractedContentPanel.copyMenuItem.text=Copy
ExtractedContentPanel.selectAllMenuItem.text=Select All
KeywordSearchSimpleTopComponent.cutMenuItem.text=Cut
KeywordSearchSimpleTopComponent.copyMenuItem.text=Copy
KeywordSearchSimpleTopComponent.pasteMenuItem.text=Paste
KeywordSearchSimpleTopComponent.selectAllMenuItem.text=Select All
KeywordSearchListTopComponent.cutMenuItem.text=Cut
KeywordSearchListTopComponent.copyMenuItem.text=Copy
KeywordSearchListTopComponent.pasteMenuItem.text=Paste
KeywordSearchListTopComponent.selectAllMenuItem.text=Select All
KeywordSearchEditListPanel.saveListButton.text=Save As
KeywordSearchEditListPanel.addWordField.text=
KeywordSearchEditListPanel.addWordButton.text=Add
@ -78,7 +29,6 @@ KeywordSearchListsManagementPanel.importButton.text=Import List
KeywordSearchPanel.searchBox.text=Search...
KeywordSearchPanel.regExCheckboxMenuItem.text=Use Regular Expressions
KeywordSearchPanel.settingsLabel.text=
KeywordSearchPanel.listsButton.text=Keyword Lists
KeywordSearchListsViewerPanel.searchAddButton.text=Search
KeywordSearchListsViewerPanel.manageListsButton.text=Manage Lists
KeywordSearchIngestSimplePanel.jLabel1.text=Select lists to use during ingest:

View File

@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.corecomponents.AdvancedConfigurationDialog;
*/
class KeywordSearchConfigurationAction extends CallableSystemAction{
private static final String ACTION_NAME = "Keyword List Configuration";
private static final String ACTION_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig");
@Override
public void performAction() {

View File

@ -24,7 +24,6 @@
*/
package org.sleuthkit.autopsy.keywordsearch;
import java.awt.BorderLayout;
import java.util.logging.Logger;
import org.sleuthkit.autopsy.ingest.IngestManager;
@ -37,7 +36,7 @@ public class KeywordSearchConfigurationPanel extends javax.swing.JPanel {
KeywordSearchListsManagementPanel listsManagementPanel;
KeywordSearchEditListPanel editListPanel;
private static final Logger logger = Logger.getLogger(KeywordSearchConfigurationPanel.class.getName());
private static final String KEYWORD_CONFIG_NAME = "Keyword List Configuration";
private static final String KEYWORD_CONFIG_NAME = org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleConfig");
private static KeywordSearchConfigurationPanel instance;
/** Creates new form KeywordSearchConfigurationPanel */

View File

@ -220,7 +220,7 @@
<Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.listsButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="ListBundleName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="borderPainted" type="boolean" value="false"/>
<Property name="contentAreaFilled" type="boolean" value="false"/>

View File

@ -194,7 +194,7 @@ public class KeywordSearchPanel extends AbstractKeywordSearchPerformer{
searchBoxPanel.setBorder(new javax.swing.border.LineBorder(java.awt.Color.lightGray, 1, true));
searchBoxPanel.setPreferredSize(new java.awt.Dimension(255, 18));
searchBox.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N
searchBox.setFont(new java.awt.Font("Tahoma", 0, 14));
searchBox.setForeground(java.awt.Color.lightGray);
searchBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchBox.text")); // NOI18N
searchBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 3, 4, 1));
@ -256,7 +256,7 @@ public class KeywordSearchPanel extends AbstractKeywordSearchPerformer{
);
listsButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon.png"))); // NOI18N
listsButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.listsButton.text")); // NOI18N
listsButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleName")); // NOI18N
listsButton.setBorderPainted(false);
listsButton.setContentAreaFilled(false);
listsButton.setEnabled(false);

View File

@ -7,4 +7,8 @@
</target>
<target name="copyExternalLibs">
</target>
<target name="build-installer-unix">
<echo>Unix installer creation not supported at this time</echo>
</target>
</project>

View File

@ -26,4 +26,31 @@
<copy file="${env.CRT_HOME}/msvcp90.dll" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/msvcp90.dll"/>
<copy file="${env.CRT_HOME}/msvcr90.dll" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/msvcr90.dll"/>
</target>
<target name="autoAIPath" >
<available file="C:\Program Files (x86)\Caphyon\Advanced Installer 9.0.1\bin\x86\AdvancedInstaller.com"
property="aiPath"
value="C:\Program Files (x86)\Caphyon\Advanced Installer 9.0.1\bin\x86\AdvancedInstaller.com"/>
</target>
<target name="inputAIPath" unless="aiPath">
<input addProperty="aiPath"
message="Enter the location of AdvancedInstaller.com"/>
</target>
<target name="run-advanced-installer" depends="autoAIPath,inputAIPath">
<fail unless="aiPath" message="Could not locate Advanced Installer."/>
<exec executable="${aiPath}">
<arg line="/build ${basedir}\installer_${app.name}\installer_${app.name}.aip"/>
</exec>
</target>
<target name="build-installer-windows">
<antcall target="run-advanced-installer" />
<move file="${basedir}/installer_${app.name}/installer_${app.name}-SetupFiles/installer_${app.name}.msi"
tofile="${nbdist.dir}/${app.name}-installer.msi"/>
<!--<delete dir="${nbdist.dir}/${app.name}-installer"/>-->
<delete dir="${basedir}/installer_${app.name}/installer_${app.name}-cache"/>
<delete dir="${basedir}/installer_${app.name}/installer_${app.name}-SetupFiles"/>
</target>
</project>

View File

@ -168,13 +168,26 @@
<subant target="javadoc" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false" />
</target>
<target name="build-installer-root" depends="findJRE,build-zip" >
<target name="build-installer-dir" depends="findJRE,build-zip" >
<unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/>
<antcall target="update-conf-file" />
<delete file="${nbdist.dir}/${app.name}-${app.version}.zip"/>
<unzip src="${basedir}/thirdparty/gstreamer/${os.family}.zip" dest="${nbdist.dir}/${app.name}-installer/gstreamer"/>
<unzip src="${basedir}/thirdparty/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${nbdist.dir}/${app.name}-installer/gstreamer"/>
<copy todir="${nbdist.dir}/${app.name}-installer/jre6">
<fileset dir="${env.JRE_HOME}"/>
</copy>
<copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${nbdist.dir}/${app.name}-installer/icon.ico" overwrite="true"/>
</target>
<target name="update-conf-file" depends="getProps">
<propertyfile
file="${nbdist.dir}/${app.name}-installer/etc/${app.name}.conf">
<entry key="jdkhome" value="&quot;jre6&quot;" />
<entry key="default_options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx1024m&quot;" />
</propertyfile>
</target>
<target name="build-installer" depends="build-installer-dir">
<antcall target="build-installer-${os.family}" />
</target>
</project>

File diff suppressed because one or more lines are too long