[jitsi-dev] [jitsi] Pipe does not work in windows makefile with Mingw and Msys so we came up with another solution that does. This also removes the last remaining dependency on msys (sed) as far as we can tell. (#235)


#1

You can view, comment on, or merge this pull request online at:

  https://github.com/jitsi/jitsi/pull/235

-- Commit Summary --

  * fix misc. compile problems
  * Fix wix location
  * Enable splashscreen
  * Update wix location to C:\wix310
  * Hardcode ARCH to "x86" since the detector script doesn't seem to work in windows
  * Add latest working jre versions
  * Update installers.properties
  * Update Makefile
  * Add working ARCH detect

-- File Changes --

    M resources/install/ant-build-config.properties (13)
    M resources/install/build.xml (2)
    M resources/install/doc/readme.txt (7)
    M resources/install/installers.properties (6)
    M src/native/windows/run/Makefile (12)
    M src/native/windows/setup/Makefile (18)
    M src/native/windows/setup/cleansweep/Makefile (7)
    M src/net/java/sip/communicator/impl/version/NightlyBuildID.java (2)

-- Patch Links --

https://github.com/jitsi/jitsi/pull/235.patch
https://github.com/jitsi/jitsi/pull/235.diff

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235


#2

This is just our first try. If anyone has a better way to do this we we are open to suggestions.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235#issuecomment-193396091


#3

Closed #235.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235#event-580600601


#4

@@ -27,5 +27,5 @@
     /**
      * The build ID.
      */
- public static final String BUILD_ID="0.build.by.SVN";
+ public static final String BUILD_ID="1";
}

When invoking ant you just need to pass -Dlabel="1" and this is going to be set as build version.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235/files#r55254285


#5

You should work on a branch, not on master. And for a pull request you *need* to do that.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235#issuecomment-193415815


#6

@@ -573,7 +573,7 @@
                 todir="${light.dir}"
                 overwrite="true" />

- <property name="wix.home" value="C:\Program Files\WiX" />
+ <property name="wix.home" value="C:\wix310" />

This also can be controlled with passing parameters to ant as -Dwix.home="C:\wix310".

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235/files#r55274616


#7

Thanks for the info.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/235#issuecomment-193498650