eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed name from llcon to Jamulus

Browse source
This commit is contained in:
Volker Fischer 2013-02-19 21:20:15 +00:00
parent 17b252699c
commit 5562410594
8 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,7 +1,12 @@
3.2.3 3.3.1
TODO: Mac OS 64bit support TODO: Mac OS 64bit support
3.3.0
- renamed the software from llcon to Jamulus
- support for an instrument picture on the fader tag - support for an instrument picture on the fader tag
- a server welcome message can be shown on a connect to the - a server welcome message can be shown on a connect to the

2
linux/deploy_linux.sh
View file

@ -6,5 +6,5 @@ qmake llcon.pro
make -j2 make -j2
make dist make dist
mv *.tar.gz deploy/llcon-version.tar.gz mv *.tar.gz deploy/Jamulus-version.tar.gz
cd linux cd linux

2
llcon.pro
View file

@ -1,4 +1,4 @@
TARGET = llcon TARGET = Jamulus
CONFIG += qt \ CONFIG += qt \
thread \ thread \

10
mac/deploy_mac.sh
View file

@ -7,21 +7,21 @@ cd ..
# first clean up # first clean up
rm -rf llcon.app rm -rf Jamulus.app
make clean make clean
# make everything # make everything
make -j2 make -j2
# call qt mac deploy tool # call qt mac deploy tool
macdeployqt llcon.app -dmg macdeployqt Jamulus.app -dmg
# create zip file including COPYING file # create zip file including COPYING file
zip llcon-version-mac.zip llcon.dmg COPYING zip Jamulus-version-mac.zip Jamulus.dmg COPYING
# move new file in deploy directory # move new file in deploy directory
mv llcon-version-mac.zip deploy/llcon-version-mac.zip mv Jamulus-version-mac.zip deploy/Jamulus-version-mac.zip
# cleanup and go back to original directory # cleanup and go back to original directory
rm llcon.dmg rm Jamulus.dmg
cd mac cd mac

4
src/global.h
View file

@ -71,8 +71,8 @@ LED bar: lbr
// version and application name (always use this version) // version and application name (always use this version)
#undef VERSION #undef VERSION
#define VERSION "3.2.3cvs" #define VERSION "3.3.0cvs"
#define APP_NAME "llcon" #define APP_NAME "Jamulus"
// Windows registry key name of auto run entry for the server // Windows registry key name of auto run entry for the server
#define AUTORUN_SERVER_REG_NAME "llcon server" #define AUTORUN_SERVER_REG_NAME "llcon server"

BIN
src/res/logopicture.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 30 KiB

6
windows/deploy_windows.bat
View file

@ -11,14 +11,14 @@ set QMAKESPEC=win32-msvc2010
qmake -tp vc qmake -tp vc
rem clean and compile solution ------------------------------------------------- rem clean and compile solution -------------------------------------------------
vcexpress llcon.vcxproj /clean "Release|Win32" vcexpress Jamulus.vcxproj /clean "Release|Win32"
vcexpress llcon.vcxproj /build "Release|Win32" vcexpress Jamulus.vcxproj /build "Release|Win32"
rem create installer ----------------------------------------------------------- rem create installer -----------------------------------------------------------
cd windows cd windows
"%NSIS_PATH%\makensis.exe" installer.nsi "%NSIS_PATH%\makensis.exe" installer.nsi
move llconinstaller.exe ../deploy/llcon-version-installer.exe move Jamulusinstaller.exe ../deploy/Jamulus-version-installer.exe
goto endofskript goto endofskript

9
windows/installer.nsi
View file

@ -1,10 +1,10 @@
; llcon NSIS installer script ; llcon NSIS installer script
!define APP_NAME "Llcon" !define APP_NAME "Jamulus"
!define APP_EXE "llcon.exe" !define APP_EXE "Jamulus.exe"
!define AUTORUN_NAME "llcon server" !define AUTORUN_NAME "llcon server"
!define UNINSTALL_EXE "Uninstall.exe" !define UNINSTALL_EXE "Uninstall.exe"
!define INSTALLER_NAME "llconinstaller.exe" !define INSTALLER_NAME "Jamulusinstaller.exe"
!define BINARY_PATH "..\release\" !define BINARY_PATH "..\release\"
!define VS_REDIST_PATH "C:\Program Files\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\" !define VS_REDIST_PATH "C:\Program Files\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\"
;!define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\" ;!define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 10.0\SDK\v3.5\BootStrapper\Packages\vcredist_x86\"
@ -73,7 +73,7 @@ Section
CreateDirectory "$SMPROGRAMS\${APP_NAME}" CreateDirectory "$SMPROGRAMS\${APP_NAME}"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}" CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_EXE}"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} server.lnk" "$INSTDIR\${APP_EXE}" "-s" CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Server.lnk" "$INSTDIR\${APP_EXE}" "-s"
CreateShortCut "$SMPROGRAMS\${APP_NAME}\${UNINSTALL_EXE}.lnk" "$INSTDIR\${UNINSTALL_EXE}" CreateShortCut "$SMPROGRAMS\${APP_NAME}\${UNINSTALL_EXE}.lnk" "$INSTDIR\${UNINSTALL_EXE}"
; cleanup: remove temporary Microsoft Visual Studio redistributable executable ; cleanup: remove temporary Microsoft Visual Studio redistributable executable
@ -120,6 +120,7 @@ Delete $INSTDIR\libGLESv2.dll
Delete $INSTDIR\COPYING Delete $INSTDIR\COPYING
Delete $INSTDIR\platforms\qwindows.dll Delete $INSTDIR\platforms\qwindows.dll
Delete $INSTDIR\platforms\qminimal.dll Delete $INSTDIR\platforms\qminimal.dll
RMDir $INSTDIR\platforms
Delete $INSTDIR\accessible\qtaccessiblewidgets.dll Delete $INSTDIR\accessible\qtaccessiblewidgets.dll
RMDir $INSTDIR\accessible RMDir $INSTDIR\accessible
RMDir $INSTDIR RMDir $INSTDIR