Monotone-Parent: ee4ff9bf4febdfd103bba6fa3403eb4d6bf3023b
Monotone-Revision: 9e630ff3ce4f3b8848a73aff398e706b19a426bc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-30T14:44:47 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
a6e5d5340b
commit
2ca2e7d664
|
@ -3,7 +3,6 @@
|
||||||
include ../config.make
|
include ../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
include ../Version
|
include ../Version
|
||||||
include ./Version
|
|
||||||
|
|
||||||
ADDITIONAL_INCLUDE_DIRS +=
|
ADDITIONAL_INCLUDE_DIRS +=
|
||||||
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
|
ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
|
||||||
|
|
|
@ -45,7 +45,6 @@ Appointments_OBJC_FILES = \
|
||||||
SOGoEMailAlarmsManager.m
|
SOGoEMailAlarmsManager.m
|
||||||
|
|
||||||
Appointments_RESOURCE_FILES += \
|
Appointments_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
|
|
||||||
Appointments_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
|
Appointments_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
|
||||||
|
|
|
@ -22,7 +22,6 @@ Contacts_OBJC_FILES = \
|
||||||
SOGoContactEntryPhoto.m \
|
SOGoContactEntryPhoto.m \
|
||||||
|
|
||||||
Contacts_RESOURCE_FILES += \
|
Contacts_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
|
|
||||||
Contacts_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
|
Contacts_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
|
||||||
|
|
|
@ -41,7 +41,6 @@ Mailer_OBJC_FILES += \
|
||||||
SOGoUser+Mailer.m
|
SOGoUser+Mailer.m
|
||||||
|
|
||||||
Mailer_RESOURCE_FILES += \
|
Mailer_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
|
|
||||||
Mailer_RESOURCE_FILES += \
|
Mailer_RESOURCE_FILES += \
|
||||||
|
|
|
@ -2,14 +2,13 @@
|
||||||
|
|
||||||
include ../../config.make
|
include ../../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
-include ../../Version
|
include ../../Version
|
||||||
-include ./Version
|
|
||||||
|
|
||||||
FRAMEWORK_NAME = SOGo
|
FRAMEWORK_NAME = SOGo
|
||||||
|
|
||||||
SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
|
SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
|
||||||
|
|
||||||
SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
|
SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
|
||||||
|
|
||||||
SOGo_HEADER_FILES = \
|
SOGo_HEADER_FILES = \
|
||||||
SOGoBuild.h \
|
SOGoBuild.h \
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
include ../../config.make
|
include ../../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
include ../../Version
|
include ../../Version
|
||||||
include ./Version
|
|
||||||
|
|
||||||
NEEDS_GUI=no
|
NEEDS_GUI=no
|
||||||
BUNDLE_EXTENSION = .SOGo
|
BUNDLE_EXTENSION = .SOGo
|
||||||
|
|
|
@ -15,7 +15,6 @@ AdministrationUI_OBJC_FILES = \
|
||||||
UIxAdministrationFilterPanel.m
|
UIxAdministrationFilterPanel.m
|
||||||
|
|
||||||
AdministrationUI_RESOURCE_FILES += \
|
AdministrationUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist
|
product.plist
|
||||||
|
|
||||||
AdministrationUI_RESOURCE_FILES += \
|
AdministrationUI_RESOURCE_FILES += \
|
||||||
|
|
|
@ -23,7 +23,6 @@ CommonUI_OBJC_FILES += \
|
||||||
WODirectAction+SOGo.m \
|
WODirectAction+SOGo.m \
|
||||||
|
|
||||||
CommonUI_RESOURCE_FILES += \
|
CommonUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist
|
product.plist
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@ ContactsUI_OBJC_FILES = \
|
||||||
UIxContactFolderActions.m
|
UIxContactFolderActions.m
|
||||||
|
|
||||||
ContactsUI_RESOURCE_FILES += \
|
ContactsUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
|
|
||||||
ContactsUI_RESOURCE_FILES += \
|
ContactsUI_RESOURCE_FILES += \
|
||||||
|
|
|
@ -28,7 +28,6 @@ MailPartViewers_OBJC_FILES += \
|
||||||
UIxMailPartICalActions.m \
|
UIxMailPartICalActions.m \
|
||||||
|
|
||||||
MailPartViewers_RESOURCE_FILES += \
|
MailPartViewers_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
|
|
||||||
MailPartViewers_LOCALIZED_RESOURCE_FILES += \
|
MailPartViewers_LOCALIZED_RESOURCE_FILES += \
|
||||||
|
|
|
@ -39,7 +39,6 @@ MailerUI_OBJC_FILES += \
|
||||||
# UIxFilterList.m \
|
# UIxFilterList.m \
|
||||||
|
|
||||||
MailerUI_RESOURCE_FILES += \
|
MailerUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
Toolbars/*.toolbar
|
Toolbars/*.toolbar
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
ADDITIONAL_CPPFLAGS += \
|
ADDITIONAL_CPPFLAGS += \
|
||||||
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
||||||
-DUIX_MAILER_MAJOR_VERSION=$(MAJOR_VERSION) \
|
-DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
|
||||||
-DUIX_MAILER_MINOR_VERSION=$(MINOR_VERSION) \
|
-DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
|
||||||
-DUIX_MAILER_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
|
-DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
|
||||||
|
|
|
@ -15,7 +15,6 @@ MainUI_OBJC_FILES += \
|
||||||
SOGoBrowsersPanel.m \
|
SOGoBrowsersPanel.m \
|
||||||
|
|
||||||
MainUI_RESOURCE_FILES += \
|
MainUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist \
|
product.plist \
|
||||||
SOGoProfile.sql \
|
SOGoProfile.sql \
|
||||||
SOGoProfile-oracle.sql \
|
SOGoProfile-oracle.sql \
|
||||||
|
|
|
@ -18,7 +18,6 @@ PreferencesUI_OBJC_FILES = \
|
||||||
UIxAdditionalPreferences.m
|
UIxAdditionalPreferences.m
|
||||||
|
|
||||||
PreferencesUI_RESOURCE_FILES += \
|
PreferencesUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist
|
product.plist
|
||||||
|
|
||||||
PreferencesUI_RESOURCE_FILES += \
|
PreferencesUI_RESOURCE_FILES += \
|
||||||
|
|
|
@ -4,7 +4,6 @@ include ../common.make
|
||||||
-include ../../config.make
|
-include ../../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
include ../../Version
|
include ../../Version
|
||||||
include ./Version
|
|
||||||
|
|
||||||
LIBRARY_NAME = libSOGoUI
|
LIBRARY_NAME = libSOGoUI
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,6 @@ SchedulerUI_OBJC_FILES = \
|
||||||
UIxOccurenceDialog.m
|
UIxOccurenceDialog.m
|
||||||
|
|
||||||
SchedulerUI_RESOURCE_FILES += \
|
SchedulerUI_RESOURCE_FILES += \
|
||||||
Version \
|
|
||||||
product.plist
|
product.plist
|
||||||
|
|
||||||
SchedulerUI_RESOURCE_FILES += \
|
SchedulerUI_RESOURCE_FILES += \
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
include ../../config.make
|
include ../../config.make
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
include ../../Version
|
include ../../Version
|
||||||
-include ./Version
|
|
||||||
|
|
||||||
NEEDS_GUI=no
|
NEEDS_GUI=no
|
||||||
BUNDLE_EXTENSION = .SOGo
|
BUNDLE_EXTENSION = .SOGo
|
||||||
|
|
4
Version
4
Version
|
@ -4,3 +4,7 @@
|
||||||
|
|
||||||
MAJOR_VERSION=1
|
MAJOR_VERSION=1
|
||||||
MINOR_VERSION=3
|
MINOR_VERSION=3
|
||||||
|
SUBMINOR_VERSION=6
|
||||||
|
|
||||||
|
SOPE_MAJOR_VERSION=4
|
||||||
|
SOPE_MINOR_VERSION=9
|
||||||
|
|
|
@ -225,12 +225,6 @@ genConfigMake() {
|
||||||
#cfgwrite " @echo Local GNUstep config.make is active"
|
#cfgwrite " @echo Local GNUstep config.make is active"
|
||||||
#cfgwrite ""
|
#cfgwrite ""
|
||||||
|
|
||||||
cfgwrite "SOGO_MAJOR_VERSION=0"
|
|
||||||
cfgwrite "SOGO_MINOR_VERSION=9"
|
|
||||||
cfgwrite "SOPE_MAJOR_VERSION=4"
|
|
||||||
cfgwrite "SOPE_MINOR_VERSION=9"
|
|
||||||
cfgwrite ""
|
|
||||||
|
|
||||||
if test $ARG_WITH_DEBUG = 1; then
|
if test $ARG_WITH_DEBUG = 1; then
|
||||||
cfgwrite "# configured to produce debugging code";
|
cfgwrite "# configured to produce debugging code";
|
||||||
cfgwrite "debug:=yes"
|
cfgwrite "debug:=yes"
|
||||||
|
|
Loading…
Reference in New Issue