summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/macosx-change-install-names.pl20
-rw-r--r--solenv/bin/modules/installer/globals.pm3
-rw-r--r--solenv/bin/modules/installer/systemactions.pm2
-rw-r--r--solenv/config/sdev300.ini130
-rw-r--r--solenv/config/ssolar.cmn1
-rw-r--r--solenv/gbuild/AllLangResTarget.mk2
-rw-r--r--solenv/gbuild/JunitTest.mk4
-rw-r--r--solenv/gbuild/Library.mk1
-rw-r--r--solenv/gbuild/LinkTarget.mk1
-rwxr-xr-x[-rw-r--r--]solenv/gbuild/TargetLocations.mk2
-rw-r--r--solenv/gbuild/WinResTarget.mk70
-rw-r--r--solenv/gbuild/gbuild.mk1
-rw-r--r--[-rwxr-xr-x]solenv/gbuild/platform/linux.mk4
-rw-r--r--[-rwxr-xr-x]solenv/gbuild/platform/macosx.mk4
-rw-r--r--[-rwxr-xr-x]solenv/gbuild/platform/solaris.mk4
-rw-r--r--[-rwxr-xr-x]solenv/gbuild/platform/windows.mk90
-rw-r--r--solenv/gbuild/platform/winmingw.mk69
-rw-r--r--solenv/inc/langlist.mk2
-rw-r--r--solenv/inc/minor.mk6
19 files changed, 388 insertions, 28 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index d678f05052e7..d6eb83ff99ef 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -43,6 +43,7 @@ sub action($$$)
'shl/URELIB/URELIB' => '@loader_path',
'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
'shl/OOO/OOO' => '@loader_path',
+ 'shl/LOADER/LOADER' => '@loader_path',
'shl/OXT/URELIB' => '@executable_path/urelibs',
'shl/BOXT/URELIB' => '@executable_path/urelibs',
'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
@@ -56,7 +57,7 @@ sub action($$$)
}
@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
- 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE <filepath>*';
+ 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE|LOADER <filepath>*';
$type = shift @ARGV;
$loc = shift @ARGV;
if ($type eq "SharedLibrary")
@@ -84,10 +85,21 @@ if ($type eq "extshl")
$change .= " -change $1 " . action($type, $loc, $loc) . "/$2";
$inames{$file} = $2;
}
- foreach $file (@ARGV)
+ if( $loc eq "LOADER" )
{
- my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
- system($call) == 0 or die "cannot $call";
+ foreach $file (@ARGV)
+ {
+ my $call = "install_name_tool$change -id \@loader_path/$inames{$file} $file";
+ system($call) == 0 or die "cannot $call";
+ }
+ }
+ else
+ {
+ foreach $file (@ARGV)
+ {
+ my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
+ system($call) == 0 or die "cannot $call";
+ }
}
}
foreach $file (@ARGV)
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 4bc8964901b9..066e13dcf6d4 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -94,7 +94,8 @@ BEGIN
"fur",
"ny",
"so",
- "kab"
+ "kab",
+ "tk"
);
@items_at_modules = ("Files", "Dirs", "Unixlinks");
@asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 24b070574189..07cd838cf4fa 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -954,7 +954,7 @@ sub find_file_with_file_extension
push(@installer::globals::logfileinfo, $infoline);
opendir(DIR, $dir);
- @sourcefiles = readdir(DIR);
+ @sourcefiles = sort readdir(DIR);
closedir(DIR);
my $onefile;
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 441f97ceda50..7f677870bc97 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -362,8 +362,17 @@ unxfbsdi
SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP perl %SOLARENV%/bin/zipdep.pl
- ENABLE_GCONF TRUE
- ENABLE_GNOMEVFS TRUE
+ ENABLE_GCONF YES
+ ENABLE_GNOMEVFS YES
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -616,6 +625,15 @@ unxlngi6
ENABLE_GNOMEVFS TRUE
GNUCOPY cp
GNUMAKE make
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -643,6 +661,7 @@ unxlngi6
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
+ KDE_ROOT /so/env/kde/linux/kde-3.2.2
}
common2
{
@@ -666,7 +685,6 @@ unxlngi6
JDK13PATH %SOLAR_JDK13PATH%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
- KDE_ROOT /so/env/kde/linux/kde-3.2.2
LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngi6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
@@ -678,6 +696,10 @@ unxlngi6
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /tmp
TMP /tmp
+ GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
+ GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
+ KDE_LIBS -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
}
common3:0 IF X%UPDATER%X == XX
{
@@ -899,6 +921,15 @@ unxlngx6
ENABLE_GCONF TRUE
ENABLE_GNOMEVFS TRUE
GNUMAKE make
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -926,6 +957,7 @@ unxlngx6
USE_SYSTEM_STL YES
XAU_LIBS -lXau
PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
+ KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
}
common2
{
@@ -949,7 +981,6 @@ unxlngx6
INPATH unxlngx6%PROEXT%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
- KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngx6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
@@ -963,6 +994,10 @@ unxlngx6
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /tmp
TMP /tmp
+ GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
+ GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
+ KDE_LIBS -L%KDE_ROOT%/lib64 -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
}
common3:0 IF X%UPDATER%X == XX
{
@@ -1226,9 +1261,19 @@ unxmacxi
SYSTEM_OPENSSL YES
SYSTEM_PYTHON YES
SYSTEM_ZLIB YES
+ SYSTEM_LIBGSF YES
USE_SYSTEM_STL YES
BUILD_PIXMAN YES
WITH_MOZILLA YES
+ ENABLE_CAIRO TRUE
+ SYSTEM_LIBRSVG NO
+ SYSTEM_LIBCROCO NO
+ SYSTEM_GDKPIXBUF NO
+ SYSTEM_GLIB NO
+ SYSTEM_GETTEXT NO
+ SYSTEM_PANGO NO
+ SYSTEM_LIBPNG NO
+ SYSTEM_LIBJPEG NO
}
common2
{
@@ -1453,12 +1498,22 @@ unxsoli4
ENABLE_GNOMEVFS TRUE
GNUCOPY gnucp
GNUMAKE gmake
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
+ OOO_SYSBASE_SYS_RELEASE 5.10
}
common1
{
@@ -1479,6 +1534,7 @@ unxsoli4
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+ SOLAR_GTK_ROOT /so/env/gnome/solaris_intel/cinnabar_b15
}
common2
{
@@ -1508,6 +1564,8 @@ unxsoli4
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /var/tmp
TMP /var/tmp
+ GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
+ GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
}
compath
{
@@ -1580,6 +1638,7 @@ unxsoli4
sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+ OOO_SYSBASE_SYS_RELEASE
}
}
extern
@@ -1715,6 +1774,15 @@ unxsols4
ENABLE_GNOMEVFS TRUE
GNUCOPY gnucp
GNUMAKE gmake
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -1722,6 +1790,7 @@ unxsols4
SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+ OOO_SYSBASE_SYS_RELEASE 5.10
}
common1
{
@@ -1742,6 +1811,7 @@ unxsols4
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+ SOLAR_GTK_ROOT /so/env/gnome/solaris_sparc/cinnabar_b15
}
common2
{
@@ -1772,6 +1842,8 @@ unxsols4
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /var/tmp
TMP /var/tmp
+ GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
+ GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
}
common:3 IF %UPDATER% == YES
{
@@ -1849,6 +1921,7 @@ unxsols4
sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+ OOO_SYSBASE_SYS_RELEASE
}
}
extern
@@ -1992,12 +2065,22 @@ unxsolu4
ENABLE_GCONF TRUE
# ENABLE_GNOMEVFS TRUE
GNUMAKE gmake
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+ OOO_SYSBASE_SYS_RELEASE 5.10
}
common1
{
@@ -2086,6 +2169,7 @@ unxsolu4
sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+ OOO_SYSBASE_SYS_RELEASE
}
}
extern
@@ -2231,6 +2315,15 @@ wntgcci1
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
GNUMAKE make
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -2500,6 +2593,15 @@ wntmsci11
WINDOWS_VISTA_PSDK TRUE
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+ SYSTEM_LIBRSVG YES
+ SYSTEM_LIBCROCO YES
+ SYSTEM_GDKPIXBUF YES
+ SYSTEM_GLIB YES
+ SYSTEM_GETTEXT YES
+ SYSTEM_PANGO YES
+ SYSTEM_LIBPNG YES
+ SYSTEM_LIBJPEG YES
+ SYSTEM_LIBGSF YES
}
common0
{
@@ -2772,6 +2874,15 @@ wntmsci12
CHECK_LUCENCE_INDEXER_OUTPUT TRUE
GNUCOPY cp
GNUMAKE make
+ SYSTEM_LIBRSVG NO
+ SYSTEM_LIBCROCO NO
+ SYSTEM_GDKPIXBUF NO
+ SYSTEM_GLIB NO
+ SYSTEM_GETTEXT NO
+ SYSTEM_PANGO NO
+ SYSTEM_LIBPNG NO
+ SYSTEM_LIBJPEG NO
+ SYSTEM_LIBGSF NO
}
common0
{
@@ -2812,6 +2923,7 @@ wntmsci12
common2
{
ENABLE_GRAPHITE TRUE
+ BUILD_PIXMAN TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
CALL_CDECL TRUE
CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
@@ -2824,6 +2936,7 @@ wntmsci12
CPUNAME INTEL
CVER M1500
DYNAMIC_CRT TRUE
+ ENABLE_CAIRO TRUE
ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
GUI WNT
GUIBASE WIN
@@ -3116,6 +3229,15 @@ wntmsci13
BUILD_X64 TRUE
GNUCOPY cp
GNUMAKE make
+ SYSTEM_LIBRSVG NO
+ SYSTEM_LIBCROCO NO
+ SYSTEM_GDKPIXBUF NO
+ SYSTEM_GLIB NO
+ SYSTEM_GETTEXT NO
+ SYSTEM_PANGO NO
+ SYSTEM_LIBPNG NO
+ SYSTEM_LIBJPEG NO
+ SYSTEM_LIBGSF NO
}
common0
{
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index f30fb227fea6..3694c225973c 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -166,6 +166,7 @@ common
OLD_CHAOS
OOO_JUNIT_JAR
OOO_SHELL
+ OOO_SYSBASE_SYS_RELEASE
PACKMS
PCLEAN_PATH
PKGCONFIG_ROOT
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 1b7acc947bfc..ccd574ba7c93 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -72,7 +72,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(DEFS) \
-fp=$(1) \
- $(if $<,$<,$(MERGEDFILE))" > $${RESPONSEFILE} && \
+ $(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
rm -rf $${RESPONSEFILE})
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5699398241ca..4b6fe5e7fc56 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -43,8 +43,10 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe
$(call gb_JunitTest_get_target,%) :
$(call gb_Output_announce,$*,$(true),JUT,2)
$(call gb_Helper_abbreviate_dirs_native,\
+ rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
- $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+ $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
+ rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
define gb_JunitTest_JunitTest
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index d697b1a777ca..0ce56ce41ea2 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -61,6 +61,7 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
endif
$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
$(call gb_Library__Library_impl,$(1),$(call gb_Library__get_linktargetname,$(1)))
+$(call gb_Library_add_default_nativeres,$(1),default)
endef
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8c55367fac84..cdde6ab3dbaf 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -362,6 +362,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
ifeq ($(gb_FULLDEPS),$(true))
ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index aba209c29136..60e53ec10e15 100644..100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -81,6 +81,7 @@ gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@ -105,6 +106,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
JunitTest \
LinkTarget \
Module \
+ WinResTarget \
NoexPrecompiledHeader \
PackagePart \
PrecompiledHeader \
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
new file mode 100644
index 000000000000..17c7500769f9
--- /dev/null
+++ b/solenv/gbuild/WinResTarget.mk
@@ -0,0 +1,70 @@
+
+# WinResTarget class
+
+gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
+
+define gb_WinResTarget_WinResTarget
+$(call gb_WinResTarget_WinResTarget_init,$(1))
+$$(eval $$(call gb_Module_register_target,$(call gb_WinResTarget_get_target,$(1)),$(call gb_WinResTarget_get_clean_target,$(1))))
+
+endef
+
+define gb_WinResTarget_WinResTarget_init
+$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
+$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
+$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_WinResTarget_get_target,$(1)) : $(call gb_WinResTarget_get_dep_target,$(1))
+ifneq ($(wildcard $(call gb_WinResTarget_get_dep_target,$(1))),)
+include $(call gb_WinResTarget_get_dep_target,$(1))
+else
+$(firstword $(MAKEFILE_LIST)) : $(call gb_WinResTarget_get_dep_target,$(1))
+endif
+$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
+$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
+$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
+endif
+
+endef
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_WinResTarget_get_dep_target,%) : $(gb_Helper_MISCDUMMY)
+ mkdir -p $(dir $@) && \
+ echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
+endif
+
+
+$(call gb_WinResTarget_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),RES,1)
+ $(call gb_WinResTarget__command_dep,$*,$<)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@))
+ $(call gb_WinResTarget__command,$@)
+
+$(call gb_WinResTarget_get_clean_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_WinResTarget_get_target,$*))
+
+define gb_WinResTarget_set_defs
+$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2)
+$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $(2)
+
+endef
+
+define gb_WinResTarget_set_include
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2)
+
+endef
+
+define gb_WinResTarget_add_file
+$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
+$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
+$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
+
+endef
+
+define gb_WinResTarget_add_dependency
+$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(file)))))
+
+endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6d22074dc8e6..c370ca57ce81 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -221,6 +221,7 @@ $(eval $(call gb_Deliver_init))
include $(foreach class, \
ComponentTarget \
AllLangResTarget \
+ WinResTarget \
LinkTarget \
Library \
StaticLibrary \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 757ae52c1b52..0a239360d724 100755..100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -277,10 +277,14 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
+ freetype \
jpeg \
m \
pthread \
X11 \
+ Xext \
+ SM \
+ ICE \
z
gb_Library_FILENAMES := \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index b54cb8fb1b9d..0611d2088e15 100755..100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -29,7 +29,7 @@ GUI := UNX
COM := GCC
# Darwin mktemp -t expects a prefix, not a pattern
-gb_MKTEMP := /usr/bin/mktemp -t gbuild.
+gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
gb_CC := cc
gb_CXX := g++
@@ -225,7 +225,7 @@ endef
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
ifeq ($(gb_DEBUGLEVEL),2)
gb_LinkTarget_CFLAGS += -g
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 6f29a9745f0d..f39f3e559385 100755..100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -250,10 +250,14 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
+ freetype \
jpeg \
m \
pthread \
X11 \
+ Xext \
+ SM \
+ ICE \
z
gb_Library_FILENAMES := \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5371ebf9d954..97e778d7ae9c 100755..100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -37,6 +37,7 @@ gb_CXX := cl
gb_LINK := link
gb_AWK := awk
gb_CLASSPATHSEP := ;
+gb_RC := rc
# use CC/CXX if they are nondefaults
ifneq ($(origin CC),default)
@@ -67,6 +68,13 @@ gb_COMPILERDEFS := \
gb_CPUDEFS := -DINTEL -D_X86_=1
+gb_RCDEFS := \
+ -DWINVER=0x0400 \
+ -DWIN32 \
+
+gb_RCFLAGS := \
+ -V
+
gb_CFLAGS := \
-Gd \
-GR \
@@ -180,7 +188,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
-
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
@@ -242,7 +250,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+ $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
$(3) \
-f - \
| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
@@ -281,15 +289,15 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+ $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
$(3) \
-f - \
| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(1) \
- -v OUTDIR=$(OUTDIR)/ \
+ -v OBJECTFILE=$(1) \
+ -v OUTDIR=$(OUTDIR)/ \
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
- -v REPODIR=$(REPODIR)/ \
+ -v REPODIR=$(REPODIR)/ \
> $(call gb_CxxObject_get_dep_target,$(2)))
endef
else
@@ -323,7 +331,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(4) $(5) \
-I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+ $(filter-out -I$(COMPATH)% -I$(JAVA_HOME)%,$(6)) \
$(3) \
-f - \
| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
@@ -364,7 +372,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(4) $(5) \
-I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+ $(filter-out -I$(COMPATH)% -I$(JAVA_HOME)%,$(6)) \
$(3) \
-f - \
| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
@@ -394,7 +402,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
-
# LinkTarget class
gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
@@ -417,7 +424,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
- $(PCHOBJS))) && \
+ $(PCHOBJS) $(NATIVERES))) && \
$(gb_LINK) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
@@ -443,8 +450,11 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
gdi32 \
+ gdiplus \
gnu_getopt \
+ imm32\
kernel32 \
+ msimg32 \
msvcrt \
mpr \
oldnames \
@@ -455,6 +465,7 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ winspool \
z \
gb_Library_LAYER := \
@@ -526,6 +537,26 @@ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_g
endef
+define gb_Library_add_default_nativeres
+$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
+$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+ $$(DEFS) \
+ -DADDITIONAL_VERINFO1 \
+ -DADDITIONAL_VERINFO2 \
+ -DADDITIONAL_VERINFO3 \
+)
+$(call gb_Library_add_nativeres,$(1),$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+
+endef
+
+define gb_Library_add_nativeres
+$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+
+endef
+
define gb_Library_get_dllname
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
endef
@@ -679,6 +710,45 @@ else
gb_SrsPartTarget__command_dep =
endif
+# WinResTarget class
+
+gb_WinResTarget_POSTFIX :=.res
+
+define gb_WinResTarget__command
+$(call gb_Output_announce,$(2),$(true),RES,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_RC) \
+ $(DEFS) $(FLAGS) \
+ -I$(dir $(3)) \
+ $(INCLUDE) \
+ -Fo$(1) \
+ $(RCFILE) )
+endef
+
+$(eval $(call gb_Helper_make_dep_targets,\
+ WinResTarget \
+))
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_WinResTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+ $(INCLUDE) \
+ $(DEFS) \
+ $(2) \
+ -f - \
+ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+ -v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+ -v OUTDIR=$(OUTDIR)/ \
+ -v WORKDIR=$(WORKDIR)/ \
+ -v SRCDIR=$(SRCDIR)/ \
+ -v REPODIR=$(REPODIR)/ \
+ > $(call gb_WinResTarget_get_dep_target,$(1)))
+endef
+else
+gb_WinResTarget__command_dep =
+endif
# ComponentTarget
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e03f37a68d2b..49c36c14bc1b 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -98,6 +98,13 @@ gb_CPUDEFS := \
-DINTEL \
-D_M_IX86 \
+gb_RCDEFS := \
+ -DWINVER=0x0400 \
+ -DWIN32 \
+
+gb_RCFLAGS := \
+ -V
+
gb_CFLAGS := \
-Wall \
-Wendif-labels \
@@ -534,6 +541,26 @@ $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
endef
+define gb_Library_add_default_nativeres
+$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
+$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+ $$(DEFS) \
+ -DADDITIONAL_VERINFO1 \
+ -DADDITIONAL_VERINFO2 \
+ -DADDITIONAL_VERINFO3 \
+)
+$(call gb_Library_add_nativeres,$(1),$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+
+endef
+
+define gb_Library_add_nativeres
+$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+
+endef
+
define gb_Library_get_dllname
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
endef
@@ -612,6 +639,48 @@ else
gb_SrsPartTarget__command_dep =
endif
+# WinResTarget class
+
+gb_WinResTarget_POSTFIX :=_res.o
+
+define gb_WinResTarget__command
+$(call gb_Output_announce,$(2),$(true),RES,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_RC) \
+ $(DEFS) $(FLAGS) \
+ -I$(dir $(3)) \
+ $(INCLUDE) \
+ -Fo$(patsubst %_res.o,%.res,$(1)) \
+ $(RCFILE) )
+ windres $(patsubst %_res.o,%.res,$(1)) $(1)
+ rm $(patsubst %_res.o,%.res,$(1))
+endef
+
+$(eval $(call gb_Helper_make_dep_targets,\
+ WinResTarget \
+))
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_WinResTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+ $(INCLUDE) \
+ $(DEFS) \
+ $(2) \
+ -f - \
+ | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+ -v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+ -v OUTDIR=$(OUTDIR)/ \
+ -v WORKDIR=$(WORKDIR)/ \
+ -v SRCDIR=$(SRCDIR)/ \
+ -v REPODIR=$(REPODIR)/ \
+ > $(call gb_WinResTarget_get_dep_target,$(1)))
+endef
+else
+gb_WinResTarget__command_dep =
+endif
+
# ComponentTarget
gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 4f311a1bec4a..bbf940e77406 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -104,7 +104,6 @@ nb \
nl \
nn \
nr \
-ns \
nso \
ny \
om \
@@ -151,6 +150,7 @@ tlh \
th \
tn \
tr \
+tk \
ts \
tg \
ug \
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 7cd8c89ac8f3..89c11311ca3d 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m104(Build:9579)
-BUILD=9579
-LAST_MINOR=m104
+RSCREVISION=300m105(Build:9581)
+BUILD=9581
+LAST_MINOR=m105
SOURCEVERSION=DEV300
generated by cgit (git 2.34.1) at 2024-06-07 07:45:42 +0000