Merge trift2.:/MySQL/M50/mysql-5.0 (40872761) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/triggers/pre-commit.check-case.pl

0 → 100755

+26 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/perl
		my $status = 0;

		my $pending = $ENV{'BK_PENDING'};
		exit 0 unless -f $pending;

		open FI, "<", $pending \|\| exit 0;
		while(<FI>) {
		my ($file, $stuff) = split /\\|/, $_, 2;
		next unless -f $file;
		$file =~ s/^(.)\/([^\/])$/$2/;
		my $path = $1;
		opendir DIR, $path;
		my @files = sort map { lc } readdir DIR;
		closedir DIR;
		my %count = ();
		$count{$_}++ for @files;
		@files = grep { $count{$_} > 1 } keys %count;
		if(@files > 0) {
		print "$path/$file: duplicate file names: " . (join " ", @files) . "\n";
		$status = 1;
		}
		}
		close FI;

		exit $status;

+9 −8

Original line number	Diff line number	Diff line
		@@ -109,6 +109,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT})
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})

		# Disable automatic manifest generation.
		STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
		${CMAKE_EXE_LINKER_FLAGS})
		# Explicitly disable it since it is the default for newer versions of VS
		STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
		IF(NOT tmp_manifest)
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
		ENDIF(NOT tmp_manifest)

		ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		CMAKE_GENERATOR MATCHES "Visual Studio 8")

		@@ -156,14 +165,6 @@ IF(EMBED_MANIFESTS)
		MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")
		ENDIF(HAVE_SIGN_TOOL)

		# Disable automatic manifest generation.
		STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS
		${CMAKE_EXE_LINKER_FLAGS})
		# Explicitly disable it since it is the default for newer versions of VS
		STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
		IF(NOT tmp_manifest)
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
		ENDIF(NOT tmp_manifest)
		# Set the processor architecture.
		IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
		SET(PROCESSOR_ARCH "amd64")

+6 −1

Original line number	Diff line number	Diff line
		@@ -124,6 +124,8 @@ case $MACHINE_TYPE in
		esac

		# Save some variables and the command line options for mysqlbug
		SAVE_CC="$CC"
		SAVE_CXX="$CXX"
		SAVE_ASFLAGS="$ASFLAGS"
		SAVE_CFLAGS="$CFLAGS"
		SAVE_CXXFLAGS="$CXXFLAGS"
		@@ -131,6 +133,8 @@ SAVE_LDFLAGS="$LDFLAGS"
		SAVE_CXXLDFLAGS="$CXXLDFLAGS"
		CONF_COMMAND="$0 $ac_configure_args"
		AC_SUBST(CONF_COMMAND)
		AC_SUBST(SAVE_CC)
		AC_SUBST(SAVE_CXX)
		AC_SUBST(SAVE_ASFLAGS)
		AC_SUBST(SAVE_CFLAGS)
		AC_SUBST(SAVE_CXXFLAGS)
		@@ -373,6 +377,7 @@ AC_SUBST(CC)
		AC_SUBST(CFLAGS)
		AC_SUBST(CXX)
		AC_SUBST(CXXFLAGS)
		AC_SUBST(ASFLAGS)
		AC_SUBST(LD)
		AC_SUBST(INSTALL_SCRIPT)

		@@ -631,7 +636,7 @@ AC_SUBST(NOINST_LDFLAGS)

		if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
		then
		tmp=`nm /usr/lib/libc.a \| grep _nss_files_getaliasent_r`
		tmp=`nm /usr/lib*/libc.a \| grep _nss_files_getaliasent_r`
		if test -n "$tmp"
		then
		STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

+3 −3

+3 −3