Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oops. I was just trying to open a pull for one particular commit. Not all of them. #235

Closed
wants to merge 9 commits into from
Closed

Oops. I was just trying to open a pull for one particular commit. Not all of them. #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd56d96
fix misc. compile problems
Feb 21, 2016
a5a25df
Fix wix location
Feb 21, 2016
960c818
Enable splashscreen
powerpbx Feb 25, 2016
96b161c
Update wix location to C:\wix310
powerpbx Feb 26, 2016
70d5dc1
Hardcode ARCH to "x86" since the detector script doesn't seem to work…
powerpbx Feb 26, 2016
685e0c7
Add latest working jre versions
powerpbx Mar 6, 2016
05b205a
Update installers.properties
powerpbx Mar 7, 2016
7309ad7
Update Makefile
powerpbx Mar 7, 2016
e26bdb5
Add working ARCH detect
powerpbx Mar 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions resources/install/ant-build-config.properties
View file
Open in desktop
@@ -1,9 +1,9 @@
application.name=Jitsi
application.web=http://jitsi.org/
application.email=jitsi@jitsi.org
package.name=jitsi
installer.welcome.wtext1=This software is developed by: Jitsi <jitsi@jitsi.org>
installer.welcome.wtext2=The homepage is at: http://jitsi.org/
application.name=PowerPBX client
application.web=http://powerpbx.org/
application.email=devops@powerpbx.org
package.name=PowerPBX client
installer.welcome.wtext1=This software is developed by: PowerPBX <devops@powerpbx.org>
installer.welcome.wtext2=The homepage is at: http://powerpbx.org/
installer.welcome.wtext3=
wix.product.id=F9465836-4F3B-40CC-B2CF-195F5D2FB4DD
wix.upgrade.code=F9F09BE0-BA75-4C0D-8D64-E434D78548D4
Expand All @@ -24,3 +24,4 @@ link.update.changelog.prefix=http://bluejimp.com/jitsi/changelogs
#delta.history.location=/path/to/folder
#delta.history.size=10
#sparkle.delta.download.location=http\://download.jitsi.org/jitsi/macosx/
splashscreen.enable=true
2 changes: 1 addition & 1 deletion resources/install/build.xml
View file
Open in desktop
Expand Up @@ -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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


<!-- Execute heat.exe -->
<exec
Expand Down
7 changes: 3 additions & 4 deletions resources/install/doc/readme.txt
View file
Open in desktop
@@ -1,5 +1,4 @@
The SIP Communicator is currently under active development.
The version you are running is only experimental and WILL NOT
work as expected. Please refer to
<a href="http://jitsi.org/">http://jitsi.org/</a>
The PowerPBX client is currently under active development.
Please refer to:
<a href="http://github.com/powerpbx">http://github.com/powerpbx</a>
for more information.
6 changes: 3 additions & 3 deletions resources/install/installers.properties
View file
Open in desktop
Expand Up @@ -8,12 +8,12 @@ linux.jre.path=/opt/jre-install/j2re1.4.2_12
# Paths to Windows JRE setups to be included in the respective setups of SIP
# Communicator and deployed as necessary. Each of them is ignored if its
# respective ZIP path is defined to a non-empty value.
windows.jre.file=C:\\Install\\jre-7u17-windows-i586.exe
windows.jre.file=C:\\Install\\jre-8u73-windows-i586.exe
windows.jre64.file=C:\\Install\\jre-7u17-windows-x64.exe

# Paths to the ZIP files of private extracted Windows JRE setups to be deployed
# as part of the respective setups of SIP Communicator.
windows.jre.zip=C:\\Install\\jre-8u40-windows-i586.zip
windows.jre64.zip=C:\\Install\\jre-8u40-windows-x64.zip
windows.jre.zip=C:\\Install\\jre-8u51-windows-i586.zip
windows.jre64.zip=C:\\Install\\jre-8u51-windows-x64.zip

macosx.jre=${user.home}/bin/jre1.8.0_40.jre
12 changes: 8 additions & 4 deletions src/native/windows/run/Makefile
View file
Open in desktop
Expand Up @@ -28,13 +28,12 @@ ifeq ($(wildcard /bin/cygpath.*),/bin/cygpath.exe)
target.dir := $(shell cygpath --mixed "$(TARGET_DIR)")
cygwin.target.dir := $(shell cygpath --unix "$(TARGET_DIR)")
else
target.dir := "$(TARGET_DIR)"
cygwin.target.dir := "$(TARGET_DIR)"
target.dir := $(TARGET_DIR)
cygwin.target.dir := $(TARGET_DIR)
endif

CC = $(MINGW_HOME)/bin/gcc.exe
CPPFLAGS := $(CPPFLAGS) \
-O2 \
-Wall -Wreturn-type \
-DPSAPI_VERSION=1 \
-DWINVER=0x0502 -D_WIN32_WINNT=0x0502 \
Expand All @@ -59,7 +58,12 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: $(cygwin.target.dir)/config.h regis

$(cygwin.target.dir)/config.h:
-rm.exe -f ../../../../resources/install/windows/config.h
echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define COMPANYNAME "$(COMPANYNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"\n#define PRODUCTBUILDVERSION_COMMA $(PRODUCTBUILDVERSION_COMMA)\n#define TARGET_BASENAME "$(TARGET_BASENAME)"\n#define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe"' > $(cygwin.target.dir)/config.h
echo #define PRODUCTNAME "$(PRODUCTNAME)" > $(cygwin.target.dir)/config.h
echo #define COMPANYNAME "$(COMPANYNAME)" >> $(cygwin.target.dir)/config.h
echo #define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)" >> $(cygwin.target.dir)/config.h
echo #define PRODUCTBUILDVERSION_COMMA $(PRODUCTBUILDVERSION_COMMA) >> $(cygwin.target.dir)/config.h
echo #define TARGET_BASENAME "$(TARGET_BASENAME)" >> $(cygwin.target.dir)/config.h
echo #define TARGET_BASENAME_EXE "$(TARGET_BASENAME).exe" >> $(cygwin.target.dir)/config.h

$(cygwin.target.dir)/run.res: $(cygwin.target.dir)/config.h run.rc
$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) run.rc -O coff -o $(target.dir)/run.res
18 changes: 14 additions & 4 deletions src/native/windows/setup/Makefile
View file
Open in desktop
Expand Up @@ -28,12 +28,11 @@ ifeq ($(wildcard /bin/cygpath.*),/bin/cygpath.exe)
target.dir := $(shell cygpath --mixed "$(TARGET_DIR)")
cygwin.target.dir := $(shell cygpath --unix "$(TARGET_DIR)")
else
target.dir := "$(TARGET_DIR)"
cygwin.target.dir := "$(TARGET_DIR)"
target.dir := $(TARGET_DIR)
cygwin.target.dir := $(TARGET_DIR)
endif

CC = $(MINGW_HOME)/bin/gcc.exe
ARCH = $(shell $(CC) -dumpmachine | sed.exe -e s/x86_64-.*/x64/ -e s/i.86-.*/x86/ -e s/mingw32/x86/)

CPPFLAGS = \
-O2 \
Expand All @@ -50,6 +49,14 @@ LDFLAGS = \
LIBS = -ladvapi32 -lbz2 -llzma -lole32 -lshell32

MACHINE = $(shell $(CC) -dumpmachine)
ifneq (,$(findstring x86_64-,$(MACHINE)))
ARCH = x64
else ifneq (,$(findstring i.86-,$(MACHINE)))
ARCH = x86
else ifeq ("$(MACHINE)","mingw32")
ARCH = x86
endif

WINDRES = $(MINGW_HOME)/bin/windres.exe
ifneq ("x$(MACHINE)","x")
ifeq ($(wildcard $(MINGW_HOME)/bin/$(MACHINE)-windres.*),$(MINGW_HOME)/bin/$(MACHINE)-windres.exe)
Expand All @@ -76,7 +83,10 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: bspatch.c $(cygwin.target.dir)/conf

$(cygwin.target.dir)/config.h:
-rm.exe -f ../../../../resources/install/windows/config.h
echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#$(DEFINE_PACKAGECODE)\n#$(DEFINE_PACKAGESIZE)\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"' > $(cygwin.target.dir)/config.h
echo #define PRODUCTNAME "$(PRODUCTNAME)" > $(cygwin.target.dir)/config.h
echo #$(DEFINE_PACKAGECODE) >> $(cygwin.target.dir)/config.h
echo #$(DEFINE_PACKAGESIZE) >> $(cygwin.target.dir)/config.h
echo #define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)" >> $(cygwin.target.dir)/config.h

$(cygwin.target.dir)/setup.res: $(cygwin.target.dir)/config.h setup.rc
$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) setup.rc -O coff -o $(target.dir)/setup.res
7 changes: 4 additions & 3 deletions src/native/windows/setup/cleansweep/Makefile
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@ ifeq ($(wildcard /bin/cygpath.*),/bin/cygpath.exe)
target.dir := $(shell cygpath --mixed "$(TARGET_DIR)")
cygwin.target.dir := $(shell cygpath --unix "$(TARGET_DIR)")
else
target.dir := "$(TARGET_DIR)"
cygwin.target.dir := "$(TARGET_DIR)"
target.dir := $(TARGET_DIR)
cygwin.target.dir := $(TARGET_DIR)
endif

CC = $(MINGW_HOME)/bin/gcc.exe
Expand Down Expand Up @@ -60,7 +60,8 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: cleansweep.c $(cygwin.target.dir)/c

$(cygwin.target.dir)/config.h:
-rm.exe -f ../../../../../resources/install/windows/config.h
echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#$(DEFINE_PACKAGECODE)' > $(cygwin.target.dir)/config.h
echo #define PRODUCTNAME "$(PRODUCTNAME)" > $(cygwin.target.dir)/config.h
echo #$(DEFINE_PACKAGECODE) >> $(cygwin.target.dir)/config.h

$(cygwin.target.dir)/cleansweep.res: cleansweep.rc $(cygwin.target.dir)/config.h
$(WINDRES) -I../../../../../resources/install/windows -I$(target.dir) cleansweep.rc -O coff -o $(target.dir)/cleansweep.res
2 changes: 1 addition & 1 deletion src/net/java/sip/communicator/impl/version/NightlyBuildID.java
View file
Open in desktop
Expand Up @@ -27,5 +27,5 @@ public class NightlyBuildID
/**
* The build ID.
*/
public static final String BUILD_ID="0.build.by.SVN";
public static final String BUILD_ID="1";
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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