Skip to content
This repository has been archived by the owner on Aug 14, 2024. It is now read-only.

Commit

Permalink
vlmcsd-1103-2016-11-05-Hotbird64
Browse files Browse the repository at this point in the history
  • Loading branch information
Wind4 committed Nov 16, 2016
1 parent fcbbc40 commit b8fdaf9
Show file tree
Hide file tree
Showing 40 changed files with 169 additions and 28 deletions.
1 change: 1 addition & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ help:
@echo " -DNO_EXTENDED_PRODUCT_LIST Don't compile the detailed product list."
@echo " -DNO_BASIC_PRODUCT_LIST Don't compile the basic product list."
@echo " -DNO_STRICT_MODES Don't support enhanced emulator detection prevention."
@echo " -DNO_CLIENT_LIST Don't support maintaining a client list (CMIDs)."
@echo " -DNO_VERBOSE_LOG Don't support verbose logging. Removes -v option."
@echo " -DNO_LOG Don't add support for logging. Implies -DNO_VERBOSE_LOG -DNO_EXTENDED_PRODUCT_LIST and -DNO_BASIC_PRODUCT_LIST."
@echo " -DNO_RANDOM_EPID Don't support random ePIDs."
Expand Down
Empty file modified VisualStudio/msvcrt.lib
100755 → 100644
Empty file.
Empty file modified VisualStudio/msvcrt64.lib
100755 → 100644
Empty file.
2 changes: 2 additions & 0 deletions VisualStudio/vlmcs/vlmcs.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
<TerminalServerAware>true</TerminalServerAware>
<SwapRunFromCD>true</SwapRunFromCD>
<SwapRunFromNET>true</SwapRunFromNET>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -191,6 +192,7 @@
<SwapRunFromCD>true</SwapRunFromCD>
<SwapRunFromNET>true</SwapRunFromNET>
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
Empty file modified VisualStudio/vlmcsd.sln
100755 → 100644
Empty file.
2 changes: 2 additions & 0 deletions VisualStudio/vlmcsd/vlmcsd.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<SwapRunFromNET>true</SwapRunFromNET>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -195,6 +196,7 @@
<TerminalServerAware>true</TerminalServerAware>
<SwapRunFromCD>true</SwapRunFromCD>
<SwapRunFromNET>true</SwapRunFromNET>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions VisualStudio/vlmcsdmulti/vlmcsdmulti.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
<TerminalServerAware>true</TerminalServerAware>
<SwapRunFromCD>true</SwapRunFromCD>
<SwapRunFromNET>true</SwapRunFromNET>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -190,6 +191,7 @@
<SwapRunFromCD>true</SwapRunFromCD>
<SwapRunFromNET>true</SwapRunFromNET>
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
<EntryPointSymbol>WinStartUp</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
4 changes: 4 additions & 0 deletions build/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
Binary file modified floppy/floppy144.vfd
Binary file not shown.
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_dragonfly
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)

cd "$( dirname "$0" )"
gmake -C .. clean
Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_freebsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_hurd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_kfreebsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
70 changes: 62 additions & 8 deletions hotbird64-mass-build/make_linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd "$( dirname "$0" )"

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)

export VERBOSE=3
export DNS_PARSER=internal
Expand Down Expand Up @@ -400,7 +400,7 @@ fi
export CLIENT_NAME=../binaries/Linux/ppc/big-endian/glibc/vlmcs-ppc-glibc
export PROGRAM_NAME=../binaries/Linux/ppc/big-endian/glibc/vlmcsd-ppc-glibc
export MULTI_NAME=../binaries/Linux/ppc/big-endian/glibc/vlmcsdmulti-ppc-glibc
export CC=~/openwrt/staging_dir/toolchain-powerpc_405_gcc-4.8-linaro_eglibc-2.19/bin/powerpc-openwrt-linux-gcc
export CC=/opt/toolchains/ppc-openwrt-eglibc-2.19-gcc-4.8/bin/powerpc-openwrt-linux-gcc
export CFLAGS="$SMALLCC"
export PLATFORMFLAGS="-flto=16 -fwhole-program --sysroot=/opt/simplebuild/toolchains/powerpc -L/opt/simplebuild/toolchains/powerpc/lib -L/opt/simplebuild/toolchains/powerpc/usr/lib"
export LDFLAGS="$SMALLLD"
Expand Down Expand Up @@ -484,6 +484,60 @@ fi



# armv7 glibc 2.22 gcc 5.3 OpenWRT toolchain

export CC=/opt/toolchains/armelv7-OpenWRT-BCM47xx_53xx-gcc-5.3.0-glibc-2.22/bin/arm-openwrt-linux-gcc
export CLIENT_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcs-armelv7-bcm47xx_53xx-openwrt-glibc
export PROGRAM_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcsd-armelv7-bcm47xx_53xx-openwrt-glibc
export MULTI_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcsdmulti-armelv7-bcm47xx_53xx-openwrt-glibc
export CFLAGS="$SMALLCC"
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv7-a -mthumb -mtune=cortex-a9"
export LDFLAGS="$SMALLLD -static-libgcc"
export THREADS=0
export DNS_PARSER=internal

make $MAKEFLAGS allmulti

if [ $? != 0 ]; then
echo Error creating $MULTI_NAME, $CLIENT_NAME and/or $PROGRAM_NAME
exit $?
fi




# armv7 glibc 2.22 gcc 5.3 OpenWRT toolchain

export CC=/opt/toolchains/armelv7-OpenWRT-BCM47xx_53xx-gcc-5.3.0-musl-1.14/bin/arm-openwrt-linux-gcc
export CLIENT_NAME=../binaries/Linux/arm/little-endian/musl/vlmcs-armelv7-bcm47xx_53xx-openwrt-musl
export PROGRAM_NAME=../binaries/Linux/arm/little-endian/musl/vlmcsd-armelv7-bcm47xx_53xx-openwrt-musl
export MULTI_NAME=../binaries/Linux/arm/little-endian/musl/vlmcsdmulti-armelv7-bcm47xx_53xx-openwrt-musl
export CFLAGS="$SMALLCC"
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv7-a -mthumb -mtune=cortex-a9"
export LDFLAGS="$SMALLLD -static-libgcc"
export THREADS=0

make DNS_PARSER=OS $MAKEFLAGS allmulti

if [ $? != 0 ]; then
echo Error creating $MULTI_NAME, $CLIENT_NAME and/or $PROGRAM_NAME
exit $?
fi

export CLIENT_NAME=../binaries/Linux/arm/little-endian/static/vlmcs-armelv7-bcm47xx_53xx-openwrt-musl-static
export PROGRAM_NAME=../binaries/Linux/arm/little-endian/static/vlmcsd-armelv7-bcm47xx_53xx-openwrt-musl-static
export MULTI_NAME=../binaries/Linux/arm/little-endian/static/vlmcsdmulti-armelv7-bcm47xx_53xx-openwrt-musl-static
export LDFLAGS="$SMALLLD -static"

make DNS_PARSER=OS $REUSEOBJFLAGS allmulti

if [ $? != 0 ]; then
echo Error creating $MULTI_NAME, $CLIENT_NAME and/or $PROGRAM_NAME
exit $?
fi




#Android gcc 4.8 with API Level 3 (Android 1.5 cupcake) armv7

Expand Down Expand Up @@ -1233,7 +1287,7 @@ fi
export MULTI_NAME=../binaries/Linux/intel/glibc/vlmcsdmulti-x86-glibc
export CLIENT_NAME=../binaries/Linux/intel/glibc/vlmcs-x86-glibc
export PROGRAM_NAME=../binaries/Linux/intel/glibc/vlmcsd-x86-glibc
export CC=~/openwrt/staging_dir/toolchain-i386_i486_gcc-4.8-linaro_eglibc-2.19/bin/i486-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-i386_i486_gcc-4.8-linaro_eglibc-2.19/bin/i486-openwrt-linux-gcc
export CFLAGS="$SMALLCC"
export PLATFORMFLAGS="-flto=16 -fwhole-program -m32 -march=i686 -mtune=generic"
export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
Expand All @@ -1252,7 +1306,7 @@ fi

# Linux x86 glibc minimum standalone version
export PROGRAM_NAME=../binaries/Linux/intel/glibc/vlmcsd-x86-glibc-minimum
export CC=~/openwrt/staging_dir/toolchain-i386_i486_gcc-4.8-linaro_eglibc-2.19/bin/i486-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-i386_i486_gcc-4.8-linaro_eglibc-2.19/bin/i486-openwrt-linux-gcc
export CFLAGS="$SMALLCC"
export PLATFORMFLAGS="-flto=16 -fwhole-program -m32 -march=i686 -mtune=generic"
export LDFLAGS="$SMALLLD -Wl,--hash-style=gnu"
Expand Down Expand Up @@ -1503,7 +1557,7 @@ fi
export PROGRAM_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcsd-armv4el-openwrt-glibc
export CLIENT_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcs-armv4el-openwrt-glibc
export MULTI_NAME=../binaries/Linux/arm/little-endian/glibc/vlmcsdmulti-armv4el-openwrt-glibc
export CC=~/openwrt/staging_dir/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_eglibc-2.19_eabi/bin/arm-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_eglibc-2.19_eabi/bin/arm-openwrt-linux-gcc
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv4"
export FEATURES=full
export CFLAGS="$SMALLCC"
Expand All @@ -1528,7 +1582,7 @@ SUFFIX=-armv7el-openwrt-glibc
export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
export MULTI_NAME=${INSTALLDIR}vlmcsdmulti${SUFFIX}
export CC=~/openwrt/staging_dir/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_eglibc-2.19_eabi/bin/arm-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_eglibc-2.19_eabi/bin/arm-openwrt-linux-gcc
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv7 -mthumb"
export FEATURES=full
export CFLAGS="$SMALLCC"
Expand Down Expand Up @@ -1656,7 +1710,7 @@ SUFFIX=-armv4el-openwrt-uclibc
export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
export MULTI_NAME=${INSTALLDIR}vlmcsdmulti${SUFFIX}
export CC=~/openwrt/staging_dir/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/arm-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/arm-openwrt-linux-gcc
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv4 -marm"
export FEATURES=full
export CFLAGS="$SMALLCC"
Expand Down Expand Up @@ -1712,7 +1766,7 @@ SUFFIX=-armv7el-openwrt-uclibc
export PROGRAM_NAME=${INSTALLDIR}vlmcsd${SUFFIX}
export CLIENT_NAME=${INSTALLDIR}vlmcs${SUFFIX}
export MULTI_NAME=${INSTALLDIR}vlmcsdmulti${SUFFIX}
export CC=~/openwrt/staging_dir/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/arm-openwrt-linux-gcc
export CC=/opt/toolchains/toolchain-arm_mpcore+vfp_gcc-4.8-linaro_uClibc-0.9.33.2_eabi/bin/arm-openwrt-linux-gcc
export PLATFORMFLAGS="-flto=16 -fwhole-program -march=armv7 -mthumb"
export FEATURES=full
export CFLAGS="$SMALLCC"
Expand Down
4 changes: 1 addition & 3 deletions hotbird64-mass-build/make_minix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

cd ~/vlmcsd/hotbird64-mass-build

export VLMCSD_VERSION=svn$(ssh root@ubuntu64.internal "cd x; svnversion")
scp -p make_minix root@ubuntu64.internal:x/hotbird64-mass-build
scp -pr root@ubuntu64.internal:x/* ..
export VLMCSD_VERSION=$(git describe)

BINDIR="bin"
cd ..
Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_multilib_linux
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
SMALLCC="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
SMALLLD="-pipe -Wl,--hash-style=sysv -Wl,-z,norelro -Wl,--build-id=none"
SMALL="$SMALLCC $SMALLLD"
Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_netbsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/pkg/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_openbsd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/local/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_osx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export DNS_PARSER=OS

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_solaris
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)
export VERBOSE=3
export CAT=2

Expand Down
2 changes: 1 addition & 1 deletion hotbird64-mass-build/make_windows
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd "$( dirname "$0" )"

export VLMCSD_VERSION="svn`svnversion`"
export VLMCSD_VERSION=$(git describe)

msbuild='/cygdrive/c/Program Files (x86)/MSBuild/14.0/bin/MSBuild.exe'
version="$VLMCSD_VERSION, built $(date -u '+%Y-%m-%d %H:%M:%S') UTC"
Expand Down
4 changes: 4 additions & 0 deletions lib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
2 changes: 1 addition & 1 deletion man/vlmcs.1.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcs.1.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion man/vlmcsd-floppy.7.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcsd-floppy.7.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion man/vlmcsd.7.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcsd.7.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion man/vlmcsd.8.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcsd.8.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion man/vlmcsd.ini.5.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcsd.ini.5.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion man/vlmcsdmulti.1.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified man/vlmcsdmulti.1.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ DNS_PARSER ?= OS

# You should supply your own version string here

VLMCSD_VERSION ?= $(shell test -d ../.svn && echo svn`svnversion`)
VLMCSD_VERSION ?= $(shell test -d ../.git && git describe)

FEATURES ?= full
VERBOSE ?= NO
Expand Down
4 changes: 4 additions & 0 deletions src/kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#endif // CONFIG
#include CONFIG

#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif

#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
#endif
Expand Down
22 changes: 22 additions & 0 deletions src/vlmcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1432,4 +1432,26 @@ static void CreateRequestBase(REQUEST *Request)
# endif // NO_VERBOSE_LOG
}

#if _MSC_VER && !defined(_DEBUG)&& !MULTI_CALL_BINARY
int __stdcall WinStartUp(void)
{
WCHAR **szArgList;
int argc;
szArgList = CommandLineToArgvW(GetCommandLineW(), &argc);

int i;
char **argv = (char**)vlmcsd_malloc(sizeof(char*)*argc);

for (i = 0; i < argc; i++)
{
int size = WideCharToMultiByte(CP_UTF8, 0, szArgList[i], -1, argv[i], 0, NULL, NULL);
argv[i] = (char*)vlmcsd_malloc(size);
WideCharToMultiByte(CP_UTF8, 0, szArgList[i], -1, argv[i], size, NULL, NULL);
}

exit(client_main(argc, argv));
}
#endif // _MSC_VER && !defined(_DEBUG)&& !MULTI_CALL_BINARY


#endif // IS_LIBRARY
Loading

0 comments on commit b8fdaf9

Please sign in to comment.