Merge pull request #73 from google/binexport9

Merge BinExport 9 support => BinNavi 6.1

.gitignore

@@ -32,7 +32,7 @@ binnavi.map
 *.iws
 .idea/
 
-#Gradle
+# Gradle
 .gradletasknamecache
 .gradle/
 build/

README.md

@@ -58,11 +58,13 @@ in respects the yFiles license.
 To rebuild the yFiles wrapper library, first copy `y.jar` and `ysvg.jar` to
 `third_party/java/yfiles`. Then rebuild with:
 
+    mvn dependency:copy-dependencies
     ant build-yfiles-wrapper-jar
     mvn install:install-file \
         -Dfile=target/yfileswrap-obfuscated.jar \
         -DgroupId=com.google.security.zynamics.binnavi \
-        -Dversion=6.0
+        -DartifactId=yfileswrap-obfuscated \
+        -Dversion=6.1 \
         -Dpackaging=jar \
         -DlocalRepositoryPath=lib
 

lib/com/google/security/zynamics/binnavi/yfileswrap-obfuscated/6.0/yfileswrap-obfuscated-6.0.pom → lib/com/google/security/zynamics/binnavi/yfileswrap-obfuscated/6.1/yfileswrap-obfuscated-6.1.pom

@@ -4,6 +4,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.security.zynamics.binnavi</groupId>
   <artifactId>yfileswrap-obfuscated</artifactId>
-  <version>6.0</version>
+  <version>6.1</version>
   <description>POM was created from install:install-file</description>
 </project>

lib/com/google/security/zynamics/binnavi/yfileswrap-obfuscated/maven-metadata-local.xml

@@ -3,10 +3,10 @@
   <groupId>com.google.security.zynamics.binnavi</groupId>
   <artifactId>yfileswrap-obfuscated</artifactId>
   <versioning>
-    <release>6.0</release>
+    <release>6.1</release>
     <versions>
-      <version>6.0</version>
+      <version>6.1</version>
     </versions>
-    <lastUpdated>20160314125053</lastUpdated>
+    <lastUpdated>20160317102259</lastUpdated>
   </versioning>
 </metadata>

pom.xml

@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.google.security.zynamics.binnavi</groupId>
       <artifactId>yfileswrap-obfuscated</artifactId>
-      <version>6.0</version>
+      <version>6.1</version>
     </dependency>
   </dependencies>
 

src/main/java/com/google/security/zynamics/binnavi/Gui/IdaSelectionDialog/CBinExportFiles.java

@@ -26,19 +26,19 @@ public final class CBinExportFiles {
    * Files to put into the plugins directory of IDA Pro on Windows.
    */
   private static final String[] PLUGIN_FILES_WINDOWS =
-      new String[] {"zynamics_binexport_8.plw", "zynamics_binexport_8.p64"};
+      new String[] {"zynamics_binexport_9.plw", "zynamics_binexport_9.p64"};
 
   /**
    * Files to put into the plugins directory of IDA Pro on Linux.
    */
   private static final String[] PLUGIN_FILES_LINUX =
-      new String[] {"zynamics_binexport_8.plx", "zynamics_binexport_8.plx64"};
+      new String[] {"zynamics_binexport_9.plx", "zynamics_binexport_9.plx64"};
 
   /**
    * Files to put into the plugins directory of IDA Pro on MacOSX.
    */
   private static final String[] PLUGIN_FILES_MACOSX =
-      new String[] {"zynamics_binexport_8.pmc", "zynamics_binexport_8.pmc64"};
+      new String[] {"zynamics_binexport_9.pmc", "zynamics_binexport_9.pmc64"};
 
   /**
    * You are not supposed to instantiate this class.
@@ -48,16 +48,15 @@ private CBinExportFiles() {
 
   /**
    * Returns the file names of the files to be copied to the IDA Pro plugins directory.
-   * 
+   *
    * @return A list of file names.
    */
   public static String[] getPluginFiles() {
     if (SystemHelpers.isRunningWindows()) {
       return PLUGIN_FILES_WINDOWS.clone();
     } else if (SystemHelpers.isRunningLinux()) {
       return PLUGIN_FILES_LINUX.clone();
-    } else {
-      return PLUGIN_FILES_MACOSX.clone();
     }
+    return PLUGIN_FILES_MACOSX.clone();
   }
 }

src/main/java/com/google/security/zynamics/binnavi/Importers/CBinExportImporter.java

@@ -36,7 +36,7 @@ public final class CBinExportImporter extends CBaseExporter {
   /**
    * Path to the BinExport IDC file.
    */
-  private static final String BINEXPORT_VERSION = "zynamics_binexport_8";
+  private static final String BINEXPORT_VERSION = "zynamics_binexport_9";
   private static final String BINEXPORT_IDC_FILE_CONTENT = "#include <idc.idc>\n" + //
       "static main() {\n" + //
       "  Batch(0);\n" + //

src/main/java/com/google/security/zynamics/binnavi/Resources/Constants.java

@@ -29,10 +29,11 @@ public final class Constants {
   public static final String PROJECT_NAME = "BinNavi";
 
   /** Version number of the product. Used for fine-grained versioning of the database schema. */
+  // TODO(cblichmann): Rename to DATABASE_SCHEMA_VERSION.
   public static final String PROJECT_VERSION = "6.0.1";
 
   /** Version number of the product. */
-  public static final String PROJECT_SHORT_VERSION = "6.0";
+  public static final String PROJECT_SHORT_VERSION = "6.1";
 
   /** Name and version number of the project. */
   public static final String PROJECT_NAME_VERSION = PROJECT_NAME + " " + PROJECT_SHORT_VERSION;

src/main/java/com/google/security/zynamics/binnavi/exporters/BinExport/README.md

@@ -1,2 +1,6 @@
-The files in this directory are the same as in the top-level "prebuilt"
-directory. They are duplicated because symlink support in Windows is poor.
+Put the binaries of the BinExport IDA Pro plugin into this directory:
+* Linux: `zynamics_binexport_9.plx`, `zynamics_binexport_9.plx64`
+* OS X: `zynamics_binexport_9.pmc`, `zynamics_binexport_9.pmc64`
+* Windows: `zynamics_binexport_9.plw`, `zynamics_binexport_9.p64`
+
+You can download those from the GitHub "Releases" page.

wixsrc/Exporters.wxs

@@ -26,10 +26,10 @@ limitations under the License.
                 <File Id="filF24FD9F65FE08098CAFB903725D187C5" KeyPath="yes" Source="$(var.ZynamicsDir)\bindetego\binexport.idc" />
             </Component>
             <Component Id="cmpD9C8F0A2285B796B088F418F7F6C4AE9" Directory="dir6256875ED3B425D6DCD317DF9577A329" Guid="{A815C4A6-7943-454B-89FA-9F4ED590DEE9}">
-                <File Id="fil880DDDD6B30318C9160A4968855451D9" KeyPath="yes" Source="$(var.OutputDir)\zynamics_binexport_8.p64" />
+                <File Id="fil880DDDD6B30318C9160A4968855451D9" KeyPath="yes" Source="$(var.OutputDir)\zynamics_binexport_9.p64" />
             </Component>
             <Component Id="cmpBE297F27CDD931183B81A8BAC2815B91" Directory="dir6256875ED3B425D6DCD317DF9577A329" Guid="{E90C0721-0686-4375-BE11-56CEB2F4CCED}">
-                <File Id="fil58B8E8168B33A35B0243D711176F2238" KeyPath="yes" Source="$(var.OutputDir)\zynamics_binexport_8.plw" />
+                <File Id="fil58B8E8168B33A35B0243D711176F2238" KeyPath="yes" Source="$(var.OutputDir)\zynamics_binexport_9.plw" />
             </Component>
         </ComponentGroup>
     </Fragment>

wixsrc/Setup-en-us.wxl

@@ -25,7 +25,7 @@ limitations under the License.
   <String Id="Property_ArpHelpLink">http://www.zynamics.com/binnavi.html</String>
   <String Id="Property_ArpUrlInfoAbout">http://www.zynamics.com/</String>
   <String Id="Property_ProductLanguage">1033</String>
-  <String Id="Property_ProductName">BinNavi 6.0</String>
+  <String Id="Property_ProductName">BinNavi 6.1</String>
   <String Id="Property_CompanyName">Google Inc.</String>
 
   <String Id="Package_Description">[ProductName] Installation package</String>

wixsrc/Setup.wxs

@@ -76,7 +76,7 @@ limitations under the License.
     </Condition>
 
     <Media Id="1"
-        Cabinet="binnavi6.0.cab"
+        Cabinet="binnavi6.1.cab"
         EmbedCab="yes"
       />
 
@@ -169,7 +169,7 @@ limitations under the License.
     <!-- Directory Structure -->
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramMenuFolder" Name="Programs">
-        <Directory Id="ProgramMenuDir" Name="zynamics BinNavi 6.0" />
+        <Directory Id="ProgramMenuDir" Name="zynamics BinNavi 6.1" />
       </Directory>
       <Directory Id="DesktopFolder" Name="Desktop" />
       <!-- Ignore ICE48 here, it's only because of the default value set above -->
@@ -178,7 +178,7 @@ limitations under the License.
       </Directory>
       <Directory Id="ProgramFilesFolder" Name="ProgramFiles">
         <Directory Id="zynamicsProgramFiles" Name="zynamics">
-          <Directory Id="INSTALLDIR" Name="BinNavi 6.0">
+          <Directory Id="INSTALLDIR" Name="BinNavi 6.1">
             <Directory Id="BinDir" Name="bin" />
           </Directory>
         </Directory>
@@ -200,39 +200,39 @@ limitations under the License.
         <File Id="licenseRTF" Name="license.rtf" KeyPath="yes">
           <!-- Ignore ICE50 here, if we do it by the book we get no system icons -->
           <Shortcut Id="startmenuLicense" Directory="ProgramMenuDir"
-              Name="zynamics BinNavi 6.0 License" Advertise="yes"
+              Name="zynamics BinNavi 6.1 License" Advertise="yes"
               Icon="license.rtf" IconIndex="0" />
         </File>
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="ProgramMenuDir" FileSource="$(var.ProjectDir)files\Startmenu\Programs\zynamics_BinNavi_5.0">
+    <DirectoryRef Id="ProgramMenuDir" FileSource="$(var.ProjectDir)files\Startmenu\Programs\zynamics_BinNavi">
       <Component Id="ZynamicsHomePageLink"
           Guid="18B86886-F767-4F84-B1DF-3980DE838C07">
         <File Id="ZynamicsHomePageURL" Name="zynamics Home Page.url" Source="$(var.ProjectDir)files\zynamics_Home_Page.url" />
         <File Id="ReportABugURL" Name="Report a bug.url" Source="$(var.ProjectDir)files\Report_a_bug.url" />
         <RemoveFolder Id="ZynamicsHomePageLink_RemoveShortcutFolder"
             Directory="ProgramMenuDir" On="uninstall" />
-        <RegistryValue Root="HKCU" Key="SOFTWARE\zynamics\BinNavi\6.0\Shortcut"
+        <RegistryValue Root="HKCU" Key="SOFTWARE\zynamics\BinNavi\6.1\Shortcut"
             Type="string" Value="1" KeyPath="yes" />
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="IdaPluginsDir">
       <Component Id="BinExportPlugin"
           Guid="CA1D9BCF-E31B-4566-84DA-E9866CF57BFC">
-        <File Id="ExporterPLW" Name="zynamics_binexport_8.plw" Source="$(var.OutputDir)\zynamics_binexport_8.plw" />
+        <File Id="ExporterPLW" Name="zynamics_binexport_9.plw" Source="$(var.OutputDir)\zynamics_binexport_9.plw" />
       </Component>
       <Component Id="BinExportPlugin64"
           Guid="93B799DD-92A9-498B-A140-FFB20A0217D3">
-        <File Id="ExporterP64" Name="zynamics_binexport_8.p64" Source="$(var.OutputDir)\zynamics_binexport_8.p64" />
+        <File Id="ExporterP64" Name="zynamics_binexport_9.p64" Source="$(var.OutputDir)\zynamics_binexport_9.p64" />
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="INSTALLDIR" FileSource="$(var.ZynamicsJavaDir)\binnavi\data">
       <Component Id="BinNaviGUIConfig"
           Guid="9E52F23F-8569-492d-82BF-4E22E7A85209">
-        <RegistryValue Root="HKCU" Key="SOFTWARE\zynamics\BinNavi\6.0\BinNaviGuiConfig"
+        <RegistryValue Root="HKCU" Key="SOFTWARE\zynamics\BinNavi\6.1\BinNaviGuiConfig"
             Type="string" Value="1" KeyPath="yes" />
         <File Id="configXML" Name="config.xml" />
       </Component>