Permalink
Browse files

Renamed freelan2 to freelan (#59)

  • Loading branch information...
1 parent eaddafe commit 44b94106f697243b03331d3d5d78bda0437a345e @ereOn ereOn committed Mar 23, 2015
@@ -40,7 +40,7 @@ env = env.Clone()
env.Append(LIBS=libraries)
sources = list(sorted(set(env.RGlob('src', '*.cpp')) - set(env.RGlob(os.path.join('src', 'windows'), '*.cpp'))))
-app = env.Program(target=os.path.join(str(dirs['bin']), '%s%s' % (name, env.defines.version.major)), source=sources)
+app = env.Program(target=os.path.join(str(dirs['bin']), name), source=sources)
configuration = env.File(env.RGlob('config', '*.cfg'))
Return('app configuration')
@@ -89,7 +89,7 @@
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\lib;$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
- <TargetName>$(ProjectName)2</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
@@ -98,7 +98,7 @@
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\lib;$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
- <TargetName>$(ProjectName)2</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@@ -107,7 +107,7 @@
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\lib;$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
- <TargetName>$(ProjectName)2</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
@@ -116,7 +116,7 @@
<OutDir>$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\bin\</OutDir>
<LibraryPath>$(SolutionDir)\third-party\install\$(PlatformShortName)\lib;$(SolutionDir)\install\$(PlatformShortName)\$(Configuration)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);</LibraryPath>
<CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
- <TargetName>$(ProjectName)2</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -33,7 +33,7 @@ Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
Name: german; MessagesFile: compiler:Languages\German.isl
[Files]
-Source: ..\..\install\{#XARCH}\Release\bin\freelan2.exe; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
+Source: ..\..\install\{#XARCH}\Release\bin\freelan.exe; DestDir: {app}\bin; Flags: ignoreversion; Components: binaries
Source: ..\..\install\{#XARCH}\Release\config\freelan.cfg; DestDir: {app}\config; Flags: ignoreversion onlyifdoesntexist; Components: configuration
Source: files\{#ARCH}\{#TAPINF}.inf; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
Source: files\{#ARCH}\{#TAP}.cat; DestDir: {app}\driver; Flags: ignoreversion; Components: tap_adapter
@@ -61,10 +61,10 @@ Type: files; Name: {app}\log\freelan.log
[Run]
Filename: {app}\bin\tap-setup.exe; Parameters: "install ..\driver\{#TAPINF}.inf {#TAP}"; StatusMsg: "Installing the tap adapter..."; Tasks: install_tap
-Filename: {app}\bin\freelan2.exe; Parameters: "--install"; StatusMsg: "Installing Windows Service..."; Tasks: install_service; Flags: runhidden
+Filename: {app}\bin\freelan.exe; Parameters: "--install"; StatusMsg: "Installing Windows Service..."; Tasks: install_service; Flags: runhidden
[UninstallRun]
-Filename: {app}\bin\freelan2.exe; Parameters: "--uninstall"; StatusMsg: "Uninstalling Windows Service..."; Tasks: install_service; Flags: runhidden
+Filename: {app}\bin\freelan.exe; Parameters: "--uninstall"; StatusMsg: "Uninstalling Windows Service..."; Tasks: install_service; Flags: runhidden
Filename: {app}\bin\tap-setup.exe; Parameters: "remove {#TAP}"; StatusMsg: "Uninstalling all tap adapters..."; Tasks: install_tap
[Registry]
@@ -1,3 +1,3 @@
#!/bin/bash
-sudo gdb {{ sources_root }}/build/debug/bin/freelan2 -ex 'run -c {{ nodes_config_root }}/{{ item.name }}.cfg -f -d -t {{ threads_count }}'
+sudo gdb {{ sources_root }}/build/debug/bin/freelan -ex 'run -c {{ nodes_config_root }}/{{ item.name }}.cfg -f -d -t {{ threads_count }}'
@@ -1,3 +1,3 @@
#!/bin/bash
-sudo {{ sources_root }}/install/bin/freelan2 -c {{ nodes_config_root }}/{{ item.name }}.cfg -f -d -t {{ threads_count }}
+sudo {{ sources_root }}/install/bin/freelan -c {{ nodes_config_root }}/{{ item.name }}.cfg -f -d -t {{ threads_count }}
@@ -1,3 +1,3 @@
#!/bin/bash
-sudo {{ sources_root }}/install/bin/freelan2 -c {{ config_path }} -f -d -t ${1:-1}
+sudo {{ sources_root }}/install/bin/freelan -c {{ config_path }} -f -d -t ${1:-1}
@@ -4,4 +4,4 @@ USERNAME=${1:-client}
shift
-./install/bin/freelan2 -f -d --client.enabled=yes --client.disable_peer_verification=yes --client.disable_host_verification=yes --fscp.listen_on=0.0.0.0:12001 --client.username=${USERNAME} --client.password="ok" --client.public_endpoint=0.0.0.0 --client.public_endpoint=:: --client.public_endpoint=localhost:12001 $@
+./install/bin/freelan -f -d --client.enabled=yes --client.disable_peer_verification=yes --client.disable_host_verification=yes --fscp.listen_on=0.0.0.0:12001 --client.username=${USERNAME} --client.password="ok" --client.public_endpoint=0.0.0.0 --client.public_endpoint=:: --client.public_endpoint=localhost:12001 $@
@@ -1,3 +1,3 @@
#!/bin/bash
-./install/bin/freelan2 -f -d --server.enabled=yes --server.authentication_script=scripts/authenticate.sh $@
+./install/bin/freelan -f -d --server.enabled=yes --server.authentication_script=scripts/authenticate.sh $@

0 comments on commit 44b9410

Please sign in to comment.