From b11155423c7bad03be0a357510fd8a8c38aa605a Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Wed, 7 Dec 2016 05:12:11 -0800 Subject: [PATCH] Rename directories Reviewed By: gkassabli Differential Revision: D4284681 Summary: Rename csslayout directories to yoga fbshipit-source-id: f0c6855c2c6e4389b7867f48f72cbb697830fc5a --- .travis.yml | 2 +- BUCK | 10 +++++----- YOGA_DEFS | 6 +++--- YogaKit/BUCK | 8 ++++---- YogaKit/UIView+Yoga.h | 2 +- benchmark/BUCK | 2 +- benchmark/YGBenchmark.c | 2 +- csharp/BUCK | 4 ++-- csharp/Facebook.Yoga/Native.cs | 6 +++--- csharp/Yoga/YGInterop.h | 2 +- csharp/Yoga/Yoga.vcxproj | 10 +++++----- csharp/Yoga/Yoga.vcxproj.filters | 10 +++++----- csharp/tests/Facebook.Yoga/test_macos.sh | 2 +- enums.py | 4 ++-- format.sh | 3 +-- gentest/gentest-cpp.js | 2 +- gentest/gentest.rb | 2 +- java/BUCK | 6 +++--- java/com/facebook/proguard/annotations/BUCK | 2 +- .../facebook/{csslayout => yoga}/YogaAlign.java | 0 .../{csslayout => yoga}/YogaConstants.java | 0 .../{csslayout => yoga}/YogaDimension.java | 0 .../{csslayout => yoga}/YogaDirection.java | 0 .../facebook/{csslayout => yoga}/YogaEdge.java | 0 .../YogaExperimentalFeature.java | 0 .../{csslayout => yoga}/YogaFlexDirection.java | 0 .../{csslayout => yoga}/YogaJustify.java | 0 .../{csslayout => yoga}/YogaLogLevel.java | 0 .../facebook/{csslayout => yoga}/YogaLogger.java | 0 .../{csslayout => yoga}/YogaMeasureFunction.java | 0 .../{csslayout => yoga}/YogaMeasureMode.java | 0 .../{csslayout => yoga}/YogaMeasureOutput.java | 0 .../facebook/{csslayout => yoga}/YogaNode.java | 0 .../{csslayout => yoga}/YogaNodeAPI.java | 0 .../{csslayout => yoga}/YogaOverflow.java | 0 .../{csslayout => yoga}/YogaPositionType.java | 0 .../{csslayout => yoga}/YogaPrintOptions.java | 0 .../facebook/{csslayout => yoga}/YogaWrap.java | 0 java/jni/YGJNI.cpp | 2 +- .../YGAbsolutePositionTest.java | 0 .../{csslayout => yoga}/YGAlignContentTest.java | 0 .../{csslayout => yoga}/YGAlignItemsTest.java | 0 .../{csslayout => yoga}/YGAlignSelfTest.java | 0 .../{csslayout => yoga}/YGBorderTest.java | 0 .../{csslayout => yoga}/YGFlexDirectionTest.java | 0 .../facebook/{csslayout => yoga}/YGFlexTest.java | 0 .../{csslayout => yoga}/YGFlexWrapTest.java | 0 .../YGJustifyContentTest.java | 0 .../{csslayout => yoga}/YGMarginTest.java | 0 .../YGMinMaxDimensionTest.java | 0 .../{csslayout => yoga}/YGPaddingTest.java | 0 .../{csslayout => yoga}/YGRoundingTest.java | 0 .../{csslayout => yoga}/YogaNodeTest.java | 0 lib/fb/BUCK | 2 +- lib/gtest/BUCK | 2 +- lib/infer-annotations/BUCK | 2 +- lib/jsr-305/BUCK | 2 +- lib/junit/BUCK | 2 +- lib/soloader/BUCK | 2 +- tests/YGAbsolutePositionTest.cpp | 2 +- tests/YGAlignContentTest.cpp | 2 +- tests/YGAlignItemsTest.cpp | 2 +- tests/YGAlignSelfTest.cpp | 2 +- tests/YGBorderTest.cpp | 2 +- tests/YGDirtyMarkingTest.cpp | 2 +- tests/YGEdgeTest.cpp | 2 +- tests/YGFlexDirectionTest.cpp | 2 +- tests/YGFlexTest.cpp | 2 +- tests/YGFlexWrapTest.cpp | 2 +- tests/YGJustifyContentTest.cpp | 2 +- tests/YGLayoutAspectRatioTest.cpp | 2 +- tests/YGLayoutDefaultValuesTest.cpp | 2 +- tests/YGMarginTest.cpp | 2 +- tests/YGMeasureCacheTest.cpp | 2 +- tests/YGMeasureModeTest.cpp | 2 +- tests/YGMeasureTest.cpp | 2 +- tests/YGMemoryFuncTest.cpp | 2 +- tests/YGMinMaxDimensionTest.cpp | 2 +- tests/YGPaddingTest.cpp | 2 +- tests/YGRelayoutTest.cpp | 2 +- tests/YGRoundingMeasureFuncTest.cpp | 2 +- tests/YGRoundingTest.cpp | 2 +- tests/YGStyleTest.cpp | 2 +- {CSSLayout => yoga}/YGEnums.h | 0 {CSSLayout => yoga}/YGMacros.h | 0 {CSSLayout => yoga}/YGNodeList.c | 0 {CSSLayout => yoga}/YGNodeList.h | 0 {CSSLayout => yoga}/Yoga.c | 16 ++++++++-------- {CSSLayout => yoga}/Yoga.h | 2 +- 89 files changed, 82 insertions(+), 83 deletions(-) rename java/com/facebook/{csslayout => yoga}/YogaAlign.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaConstants.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaDimension.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaDirection.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaEdge.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaExperimentalFeature.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaFlexDirection.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaJustify.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaLogLevel.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaLogger.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaMeasureFunction.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaMeasureMode.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaMeasureOutput.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaNode.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaNodeAPI.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaOverflow.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaPositionType.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaPrintOptions.java (100%) rename java/com/facebook/{csslayout => yoga}/YogaWrap.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGAbsolutePositionTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGAlignContentTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGAlignItemsTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGAlignSelfTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGBorderTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGFlexDirectionTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGFlexTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGFlexWrapTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGJustifyContentTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGMarginTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGMinMaxDimensionTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGPaddingTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YGRoundingTest.java (100%) rename java/tests/com/facebook/{csslayout => yoga}/YogaNodeTest.java (100%) rename {CSSLayout => yoga}/YGEnums.h (100%) rename {CSSLayout => yoga}/YGMacros.h (100%) rename {CSSLayout => yoga}/YGNodeList.c (100%) rename {CSSLayout => yoga}/YGNodeList.h (100%) rename {CSSLayout => yoga}/Yoga.c (99%) rename {CSSLayout => yoga}/Yoga.h (98%) diff --git a/.travis.yml b/.travis.yml index c1ad41cb..618dbb0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - export PATH=$JAVA_HOME/bin:$PATH script: - - buck test //:CSSLayout + - buck test //:yoga - buck test //java:java - buck test //YogaKit:YogaKit --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI - sh csharp/tests/Facebook.Yoga/test_macos.sh diff --git a/BUCK b/BUCK index e74a0a6e..7b49825c 100644 --- a/BUCK +++ b/BUCK @@ -24,14 +24,14 @@ COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c11', '-fPIC'] TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ['-std=c++11'] cxx_library( - name = 'CSSLayout', - srcs = glob(['CSSLayout/*.c']), + name = 'yoga', + srcs = glob(['yoga/*.c']), tests=[':tests'], - exported_headers = subdir_glob([('', 'CSSLayout/*.h')]), + exported_headers = subdir_glob([('', 'yoga/*.h')]), header_namespace = '', compiler_flags = COMPILER_FLAGS, deps = [] if THIS_IS_FBOBJC else [ - csslayout_dep('lib/fb:ndklog'), + yoga_dep('lib/fb:ndklog'), ], visibility = ['PUBLIC'], ) @@ -42,7 +42,7 @@ cxx_test( srcs = glob(['tests/*.cpp']), compiler_flags = TEST_COMPILER_FLAGS, deps = [ - ':CSSLayout', + ':yoga', GTEST_TARGET, ], visibility = ['PUBLIC'], diff --git a/YOGA_DEFS b/YOGA_DEFS index 2b4a62c5..137b96fd 100644 --- a/YOGA_DEFS +++ b/YOGA_DEFS @@ -1,5 +1,5 @@ -CSSLAYOUT_ROOT = '//...' +YOGA_ROOT = '//...' INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations' JSR_305_TARGET = '//lib/jsr-305:jsr-305' JUNIT_TARGET = '//lib/junit:junit' @@ -12,12 +12,12 @@ FBJNI_TARGET = '//lib/fb:fbjni' THIS_IS_FBOBJC = False CXX_LIBRARY_WHITELIST = [ - '//:CSSLayout', + '//:yoga', '//lib/fb:fbjni', '//java:jni', ] -def csslayout_dep(dep): +def yoga_dep(dep): return '//' + dep class allow_unsafe_import: diff --git a/YogaKit/BUCK b/YogaKit/BUCK index fc97569b..4a781038 100644 --- a/YogaKit/BUCK +++ b/YogaKit/BUCK @@ -7,7 +7,7 @@ include_defs('//YOGA_DEFS') -UIKIT_CSSLAYOUT_COMPILER_FLAGS = [ +COMPILER_FLAGS = [ '-fobjc-arc', '-Wconditional-uninitialized', '-Wdangling-else', @@ -29,7 +29,7 @@ UIKIT_CSSLAYOUT_COMPILER_FLAGS = [ apple_library( name = 'YogaKit', - compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, + compiler_flags = COMPILER_FLAGS, tests = [':YogaKitTests'], srcs = glob(['*.m']), exported_headers = glob(['*.h']), @@ -38,14 +38,14 @@ apple_library( '$SDKROOT/System/Library/Frameworks/UIKit.framework', ], deps = [ - csslayout_dep(':CSSLayout'), + yoga_dep(':yoga'), ], visibility = ['PUBLIC'], ) apple_test( name = 'YogaKitTests', - compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, + compiler_flags = COMPILER_FLAGS, info_plist = 'Tests/Info.plist', srcs = glob(['Tests/**/*.m']), frameworks = [ diff --git a/YogaKit/UIView+Yoga.h b/YogaKit/UIView+Yoga.h index 94480da6..97bb2532 100644 --- a/YogaKit/UIView+Yoga.h +++ b/YogaKit/UIView+Yoga.h @@ -8,7 +8,7 @@ */ #import -#import +#import @interface UIView (Yoga) diff --git a/benchmark/BUCK b/benchmark/BUCK index 4fafe0df..1dd388cc 100644 --- a/benchmark/BUCK +++ b/benchmark/BUCK @@ -21,7 +21,7 @@ cxx_binary( '-std=c11', ], deps = [ - csslayout_dep(':CSSLayout'), + yoga_dep(':yoga'), ], visibility = ['PUBLIC'], ) diff --git a/benchmark/YGBenchmark.c b/benchmark/YGBenchmark.c index c326616f..2e816359 100644 --- a/benchmark/YGBenchmark.c +++ b/benchmark/YGBenchmark.c @@ -9,7 +9,7 @@ #include "YGBenchmark.h" -#include +#include static YGSize _measure(YGNodeRef node, float width, diff --git a/csharp/BUCK b/csharp/BUCK index 6219ab85..8223450a 100644 --- a/csharp/BUCK +++ b/csharp/BUCK @@ -6,14 +6,14 @@ # of patent rights can be found in the PATENTS file in the same directory. csharp_library( - name = 'csslibnet46', + name = 'yogalibnet46', dll_name = 'Facebook.Yoga.dll', framework_ver = 'net46', srcs = glob(['**/*.cs']), ) csharp_library( - name = 'csslibnet45', + name = 'yogalibnet45', dll_name = 'Facebook.Yoga.dll', framework_ver = 'net45', srcs = glob(['**/*.cs']), diff --git a/csharp/Facebook.Yoga/Native.cs b/csharp/Facebook.Yoga/Native.cs index 587c0314..7786b8cf 100644 --- a/csharp/Facebook.Yoga/Native.cs +++ b/csharp/Facebook.Yoga/Native.cs @@ -28,13 +28,13 @@ namespace Facebook.Yoga public static extern IntPtr YGNodeNew(); [DllImport(DllName)] - public static extern void YGNodeInit(IntPtr cssNode); + public static extern void YGNodeInit(IntPtr node); [DllImport(DllName)] - public static extern void YGNodeFree(IntPtr cssNode); + public static extern void YGNodeFree(IntPtr node); [DllImport(DllName)] - public static extern void YGNodeReset(IntPtr cssNode); + public static extern void YGNodeReset(IntPtr node); [DllImport(DllName)] public static extern int YGNodeGetInstanceCount(); diff --git a/csharp/Yoga/YGInterop.h b/csharp/Yoga/YGInterop.h index b544d3db..7494977f 100644 --- a/csharp/Yoga/YGInterop.h +++ b/csharp/Yoga/YGInterop.h @@ -9,7 +9,7 @@ #pragma once -#include +#include YG_EXTERN_C_BEGIN diff --git a/csharp/Yoga/Yoga.vcxproj b/csharp/Yoga/Yoga.vcxproj index 30d2947d..b3704474 100755 --- a/csharp/Yoga/Yoga.vcxproj +++ b/csharp/Yoga/Yoga.vcxproj @@ -150,16 +150,16 @@ - - - + + + - - + + false diff --git a/csharp/Yoga/Yoga.vcxproj.filters b/csharp/Yoga/Yoga.vcxproj.filters index 415d0824..c3afcf63 100755 --- a/csharp/Yoga/Yoga.vcxproj.filters +++ b/csharp/Yoga/Yoga.vcxproj.filters @@ -21,13 +21,13 @@ Header Files - + Header Files - + Header Files - + Header Files @@ -41,10 +41,10 @@ Source Files - + Source Files - + Source Files diff --git a/csharp/tests/Facebook.Yoga/test_macos.sh b/csharp/tests/Facebook.Yoga/test_macos.sh index 9a3ad14f..7df36893 100755 --- a/csharp/tests/Facebook.Yoga/test_macos.sh +++ b/csharp/tests/Facebook.Yoga/test_macos.sh @@ -28,6 +28,6 @@ if [ -d $NUNIT \ rm NUnit-2.6.4.zip fi -clang -g -Wall -Wextra -dynamiclib -o libyoga.dylib -I../../.. ../../../CSSLayout/*.c ../../Yoga/YGInterop.cpp +clang -g -Wall -Wextra -dynamiclib -o libyoga.dylib -I../../.. ../../../yoga/*.c ../../Yoga/YGInterop.cpp mcs -debug -t:library -r:$NUNIT/nunit.framework.dll -out:YogaTest.dll *.cs ../../../csharp/Facebook.Yoga/*cs MONO_PATH=$NUNIT mono --arch=64 --debug $NUNIT/nunit-console.exe YogaTest.dll diff --git a/enums.py b/enums.py index e1626f10..d2fc6dc0 100644 --- a/enums.py +++ b/enums.py @@ -114,7 +114,7 @@ def to_java_upper(symbol): root = os.path.dirname(__file__) # write out C header -with open(root + '/CSSLayout/YGEnums.h', 'w') as f: +with open(root + '/yoga/YGEnums.h', 'w') as f: f.write(LICENSE) f.write('#pragma once\n\n') f.write('#include "YGMacros.h"\n\n') @@ -133,7 +133,7 @@ with open(root + '/CSSLayout/YGEnums.h', 'w') as f: # write out java files for name, values in ENUMS.items(): - with open(root + '/java/com/facebook/csslayout/Yoga%s.java' % name, 'w') as f: + with open(root + '/java/com/facebook/yoga/Yoga%s.java' % name, 'w') as f: f.write(LICENSE) f.write('package com.facebook.yoga;\n\n') f.write('import com.facebook.proguard.annotations.DoNotStrip;\n\n') diff --git a/format.sh b/format.sh index 01464ab2..c8affc49 100755 --- a/format.sh +++ b/format.sh @@ -29,7 +29,6 @@ clang-format \ SpaceAfterCStyleCast: true, \ UseTab: Never, \ }" "$@" \ - -i $(dirname $0)/CSSLayout/*.{h,c,cpp} \ - $(dirname $0)/tests/CSSLayoutTestUtils/*.{h,c,cpp} \ + -i $(dirname $0)/yoga/*.{h,c,cpp} \ $(dirname $0)/benchmarks/*.{h,c,cpp} \ $(dirname $0)/java/jni/*.{h,c,cpp} diff --git a/gentest/gentest-cpp.js b/gentest/gentest-cpp.js index f4db36ed..0333dd7c 100644 --- a/gentest/gentest-cpp.js +++ b/gentest/gentest-cpp.js @@ -20,7 +20,7 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, { emitPrologue:{value:function() { this.push([ - '#include ', + '#include ', '#include ', '', ]); diff --git a/gentest/gentest.rb b/gentest/gentest.rb index 88191ce0..4293866d 100644 --- a/gentest/gentest.rb +++ b/gentest/gentest.rb @@ -40,7 +40,7 @@ Dir['fixtures/*.html'].each do |file| f.write eval(logs[0].message.sub(/^[^"]*/, '')) f.close - f = File.open("../java/tests/com/facebook/csslayout/#{name}.java", 'w') + f = File.open("../java/tests/com/facebook/yoga/#{name}.java", 'w') f.write eval(logs[1].message.sub(/^[^"]*/, '')).sub('YogaTest', name) f.close diff --git a/java/BUCK b/java/BUCK index 3c48166d..70775d15 100644 --- a/java/BUCK +++ b/java/BUCK @@ -24,16 +24,16 @@ cxx_library( deps = [ FBJNI_TARGET, JNI_TARGET, - csslayout_dep(':CSSLayout'), + yoga_dep(':yoga'), ], visibility = ['PUBLIC'], ) java_library( name = 'java', - srcs = glob(['com/facebook/csslayout/*.java']), + srcs = glob(['com/facebook/yoga/*.java']), tests=[ - csslayout_dep('java:tests'), + yoga_dep('java:tests'), ], source = '1.7', target = '1.7', diff --git a/java/com/facebook/proguard/annotations/BUCK b/java/com/facebook/proguard/annotations/BUCK index 86f1b22f..2af11a81 100644 --- a/java/com/facebook/proguard/annotations/BUCK +++ b/java/com/facebook/proguard/annotations/BUCK @@ -13,5 +13,5 @@ java_library( source = '1.7', target = '1.7', deps = [], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/java/com/facebook/csslayout/YogaAlign.java b/java/com/facebook/yoga/YogaAlign.java similarity index 100% rename from java/com/facebook/csslayout/YogaAlign.java rename to java/com/facebook/yoga/YogaAlign.java diff --git a/java/com/facebook/csslayout/YogaConstants.java b/java/com/facebook/yoga/YogaConstants.java similarity index 100% rename from java/com/facebook/csslayout/YogaConstants.java rename to java/com/facebook/yoga/YogaConstants.java diff --git a/java/com/facebook/csslayout/YogaDimension.java b/java/com/facebook/yoga/YogaDimension.java similarity index 100% rename from java/com/facebook/csslayout/YogaDimension.java rename to java/com/facebook/yoga/YogaDimension.java diff --git a/java/com/facebook/csslayout/YogaDirection.java b/java/com/facebook/yoga/YogaDirection.java similarity index 100% rename from java/com/facebook/csslayout/YogaDirection.java rename to java/com/facebook/yoga/YogaDirection.java diff --git a/java/com/facebook/csslayout/YogaEdge.java b/java/com/facebook/yoga/YogaEdge.java similarity index 100% rename from java/com/facebook/csslayout/YogaEdge.java rename to java/com/facebook/yoga/YogaEdge.java diff --git a/java/com/facebook/csslayout/YogaExperimentalFeature.java b/java/com/facebook/yoga/YogaExperimentalFeature.java similarity index 100% rename from java/com/facebook/csslayout/YogaExperimentalFeature.java rename to java/com/facebook/yoga/YogaExperimentalFeature.java diff --git a/java/com/facebook/csslayout/YogaFlexDirection.java b/java/com/facebook/yoga/YogaFlexDirection.java similarity index 100% rename from java/com/facebook/csslayout/YogaFlexDirection.java rename to java/com/facebook/yoga/YogaFlexDirection.java diff --git a/java/com/facebook/csslayout/YogaJustify.java b/java/com/facebook/yoga/YogaJustify.java similarity index 100% rename from java/com/facebook/csslayout/YogaJustify.java rename to java/com/facebook/yoga/YogaJustify.java diff --git a/java/com/facebook/csslayout/YogaLogLevel.java b/java/com/facebook/yoga/YogaLogLevel.java similarity index 100% rename from java/com/facebook/csslayout/YogaLogLevel.java rename to java/com/facebook/yoga/YogaLogLevel.java diff --git a/java/com/facebook/csslayout/YogaLogger.java b/java/com/facebook/yoga/YogaLogger.java similarity index 100% rename from java/com/facebook/csslayout/YogaLogger.java rename to java/com/facebook/yoga/YogaLogger.java diff --git a/java/com/facebook/csslayout/YogaMeasureFunction.java b/java/com/facebook/yoga/YogaMeasureFunction.java similarity index 100% rename from java/com/facebook/csslayout/YogaMeasureFunction.java rename to java/com/facebook/yoga/YogaMeasureFunction.java diff --git a/java/com/facebook/csslayout/YogaMeasureMode.java b/java/com/facebook/yoga/YogaMeasureMode.java similarity index 100% rename from java/com/facebook/csslayout/YogaMeasureMode.java rename to java/com/facebook/yoga/YogaMeasureMode.java diff --git a/java/com/facebook/csslayout/YogaMeasureOutput.java b/java/com/facebook/yoga/YogaMeasureOutput.java similarity index 100% rename from java/com/facebook/csslayout/YogaMeasureOutput.java rename to java/com/facebook/yoga/YogaMeasureOutput.java diff --git a/java/com/facebook/csslayout/YogaNode.java b/java/com/facebook/yoga/YogaNode.java similarity index 100% rename from java/com/facebook/csslayout/YogaNode.java rename to java/com/facebook/yoga/YogaNode.java diff --git a/java/com/facebook/csslayout/YogaNodeAPI.java b/java/com/facebook/yoga/YogaNodeAPI.java similarity index 100% rename from java/com/facebook/csslayout/YogaNodeAPI.java rename to java/com/facebook/yoga/YogaNodeAPI.java diff --git a/java/com/facebook/csslayout/YogaOverflow.java b/java/com/facebook/yoga/YogaOverflow.java similarity index 100% rename from java/com/facebook/csslayout/YogaOverflow.java rename to java/com/facebook/yoga/YogaOverflow.java diff --git a/java/com/facebook/csslayout/YogaPositionType.java b/java/com/facebook/yoga/YogaPositionType.java similarity index 100% rename from java/com/facebook/csslayout/YogaPositionType.java rename to java/com/facebook/yoga/YogaPositionType.java diff --git a/java/com/facebook/csslayout/YogaPrintOptions.java b/java/com/facebook/yoga/YogaPrintOptions.java similarity index 100% rename from java/com/facebook/csslayout/YogaPrintOptions.java rename to java/com/facebook/yoga/YogaPrintOptions.java diff --git a/java/com/facebook/csslayout/YogaWrap.java b/java/com/facebook/yoga/YogaWrap.java similarity index 100% rename from java/com/facebook/csslayout/YogaWrap.java rename to java/com/facebook/yoga/YogaWrap.java diff --git a/java/jni/YGJNI.cpp b/java/jni/YGJNI.cpp index 2e9fd99d..bf17f087 100644 --- a/java/jni/YGJNI.cpp +++ b/java/jni/YGJNI.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include #include diff --git a/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java b/java/tests/com/facebook/yoga/YGAbsolutePositionTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java rename to java/tests/com/facebook/yoga/YGAbsolutePositionTest.java diff --git a/java/tests/com/facebook/csslayout/YGAlignContentTest.java b/java/tests/com/facebook/yoga/YGAlignContentTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGAlignContentTest.java rename to java/tests/com/facebook/yoga/YGAlignContentTest.java diff --git a/java/tests/com/facebook/csslayout/YGAlignItemsTest.java b/java/tests/com/facebook/yoga/YGAlignItemsTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGAlignItemsTest.java rename to java/tests/com/facebook/yoga/YGAlignItemsTest.java diff --git a/java/tests/com/facebook/csslayout/YGAlignSelfTest.java b/java/tests/com/facebook/yoga/YGAlignSelfTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGAlignSelfTest.java rename to java/tests/com/facebook/yoga/YGAlignSelfTest.java diff --git a/java/tests/com/facebook/csslayout/YGBorderTest.java b/java/tests/com/facebook/yoga/YGBorderTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGBorderTest.java rename to java/tests/com/facebook/yoga/YGBorderTest.java diff --git a/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java b/java/tests/com/facebook/yoga/YGFlexDirectionTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGFlexDirectionTest.java rename to java/tests/com/facebook/yoga/YGFlexDirectionTest.java diff --git a/java/tests/com/facebook/csslayout/YGFlexTest.java b/java/tests/com/facebook/yoga/YGFlexTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGFlexTest.java rename to java/tests/com/facebook/yoga/YGFlexTest.java diff --git a/java/tests/com/facebook/csslayout/YGFlexWrapTest.java b/java/tests/com/facebook/yoga/YGFlexWrapTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGFlexWrapTest.java rename to java/tests/com/facebook/yoga/YGFlexWrapTest.java diff --git a/java/tests/com/facebook/csslayout/YGJustifyContentTest.java b/java/tests/com/facebook/yoga/YGJustifyContentTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGJustifyContentTest.java rename to java/tests/com/facebook/yoga/YGJustifyContentTest.java diff --git a/java/tests/com/facebook/csslayout/YGMarginTest.java b/java/tests/com/facebook/yoga/YGMarginTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGMarginTest.java rename to java/tests/com/facebook/yoga/YGMarginTest.java diff --git a/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java b/java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java rename to java/tests/com/facebook/yoga/YGMinMaxDimensionTest.java diff --git a/java/tests/com/facebook/csslayout/YGPaddingTest.java b/java/tests/com/facebook/yoga/YGPaddingTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGPaddingTest.java rename to java/tests/com/facebook/yoga/YGPaddingTest.java diff --git a/java/tests/com/facebook/csslayout/YGRoundingTest.java b/java/tests/com/facebook/yoga/YGRoundingTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YGRoundingTest.java rename to java/tests/com/facebook/yoga/YGRoundingTest.java diff --git a/java/tests/com/facebook/csslayout/YogaNodeTest.java b/java/tests/com/facebook/yoga/YogaNodeTest.java similarity index 100% rename from java/tests/com/facebook/csslayout/YogaNodeTest.java rename to java/tests/com/facebook/yoga/YogaNodeTest.java diff --git a/lib/fb/BUCK b/lib/fb/BUCK index dfec53fc..da59ceaa 100644 --- a/lib/fb/BUCK +++ b/lib/fb/BUCK @@ -13,7 +13,7 @@ prebuilt_cxx_library( exported_platform_linker_flags = [ ('android.*', ['-llog']), ], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) cxx_library( diff --git a/lib/gtest/BUCK b/lib/gtest/BUCK index c5a6d790..a4c8a00e 100644 --- a/lib/gtest/BUCK +++ b/lib/gtest/BUCK @@ -23,5 +23,5 @@ cxx_library( header_namespace = '', compiler_flags = COMPILER_FLAGS, deps = [], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/lib/infer-annotations/BUCK b/lib/infer-annotations/BUCK index c826e879..378a65d7 100644 --- a/lib/infer-annotations/BUCK +++ b/lib/infer-annotations/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ':infer-annotations-jar', ], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/lib/jsr-305/BUCK b/lib/jsr-305/BUCK index ae663727..8ced012c 100644 --- a/lib/jsr-305/BUCK +++ b/lib/jsr-305/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ':jsr305-jar', ], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/lib/junit/BUCK b/lib/junit/BUCK index 9b26fd30..e9bbe4b8 100644 --- a/lib/junit/BUCK +++ b/lib/junit/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ':junit-jar', ], - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/lib/soloader/BUCK b/lib/soloader/BUCK index 077b4fca..977c6d58 100644 --- a/lib/soloader/BUCK +++ b/lib/soloader/BUCK @@ -10,5 +10,5 @@ include_defs('//YOGA_DEFS') android_prebuilt_aar( name = 'soloader', aar = 'soloader-0.1.0.aar', - visibility = [CSSLAYOUT_ROOT], + visibility = [YOGA_ROOT], ) diff --git a/tests/YGAbsolutePositionTest.cpp b/tests/YGAbsolutePositionTest.cpp index fb59f1c8..c5a3891b 100644 --- a/tests/YGAbsolutePositionTest.cpp +++ b/tests/YGAbsolutePositionTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html -#include +#include #include TEST(YogaTest, absolute_layout_width_height_start_top) { diff --git a/tests/YGAlignContentTest.cpp b/tests/YGAlignContentTest.cpp index 5a2c6abf..6c2aaa40 100644 --- a/tests/YGAlignContentTest.cpp +++ b/tests/YGAlignContentTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html -#include +#include #include TEST(YogaTest, align_content_flex_start) { diff --git a/tests/YGAlignItemsTest.cpp b/tests/YGAlignItemsTest.cpp index fb5857f8..e80ae1d4 100644 --- a/tests/YGAlignItemsTest.cpp +++ b/tests/YGAlignItemsTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html -#include +#include #include TEST(YogaTest, align_items_stretch) { diff --git a/tests/YGAlignSelfTest.cpp b/tests/YGAlignSelfTest.cpp index d369dd64..436d78b4 100644 --- a/tests/YGAlignSelfTest.cpp +++ b/tests/YGAlignSelfTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html -#include +#include #include TEST(YogaTest, align_self_center) { diff --git a/tests/YGBorderTest.cpp b/tests/YGBorderTest.cpp index 0224276c..41673414 100644 --- a/tests/YGBorderTest.cpp +++ b/tests/YGBorderTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html -#include +#include #include TEST(YogaTest, border_no_size) { diff --git a/tests/YGDirtyMarkingTest.cpp b/tests/YGDirtyMarkingTest.cpp index 4682e534..3888966e 100644 --- a/tests/YGDirtyMarkingTest.cpp +++ b/tests/YGDirtyMarkingTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include TEST(YogaTest, dirty_propagation) { diff --git a/tests/YGEdgeTest.cpp b/tests/YGEdgeTest.cpp index 46a676f3..4122b11b 100644 --- a/tests/YGEdgeTest.cpp +++ b/tests/YGEdgeTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include TEST(YogaTest, start_overrides) { diff --git a/tests/YGFlexDirectionTest.cpp b/tests/YGFlexDirectionTest.cpp index 4f279e70..b6016428 100644 --- a/tests/YGFlexDirectionTest.cpp +++ b/tests/YGFlexDirectionTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html -#include +#include #include TEST(YogaTest, flex_direction_column_no_height) { diff --git a/tests/YGFlexTest.cpp b/tests/YGFlexTest.cpp index fecc30ee..559025f7 100644 --- a/tests/YGFlexTest.cpp +++ b/tests/YGFlexTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html -#include +#include #include TEST(YogaTest, flex_basis_flex_grow_column) { diff --git a/tests/YGFlexWrapTest.cpp b/tests/YGFlexWrapTest.cpp index c2d13b77..03d07a82 100644 --- a/tests/YGFlexWrapTest.cpp +++ b/tests/YGFlexWrapTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html -#include +#include #include TEST(YogaTest, wrap_column) { diff --git a/tests/YGJustifyContentTest.cpp b/tests/YGJustifyContentTest.cpp index af0052fa..b7afe1b6 100644 --- a/tests/YGJustifyContentTest.cpp +++ b/tests/YGJustifyContentTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html -#include +#include #include TEST(YogaTest, justify_content_row_flex_start) { diff --git a/tests/YGLayoutAspectRatioTest.cpp b/tests/YGLayoutAspectRatioTest.cpp index 5c35aac0..22846c9b 100644 --- a/tests/YGLayoutAspectRatioTest.cpp +++ b/tests/YGLayoutAspectRatioTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include static YGSize _measure(YGNodeRef node, diff --git a/tests/YGLayoutDefaultValuesTest.cpp b/tests/YGLayoutDefaultValuesTest.cpp index 8bb086b0..fbc1e1b9 100644 --- a/tests/YGLayoutDefaultValuesTest.cpp +++ b/tests/YGLayoutDefaultValuesTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include TEST(YogaTest, assert_default_values) { diff --git a/tests/YGMarginTest.cpp b/tests/YGMarginTest.cpp index 74f1bae0..724b2eef 100644 --- a/tests/YGMarginTest.cpp +++ b/tests/YGMarginTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html -#include +#include #include TEST(YogaTest, margin_start) { diff --git a/tests/YGMeasureCacheTest.cpp b/tests/YGMeasureCacheTest.cpp index 2a4f4482..ca932b25 100644 --- a/tests/YGMeasureCacheTest.cpp +++ b/tests/YGMeasureCacheTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include static YGSize _measureMax(YGNodeRef node, diff --git a/tests/YGMeasureModeTest.cpp b/tests/YGMeasureModeTest.cpp index 358327ff..730247fa 100644 --- a/tests/YGMeasureModeTest.cpp +++ b/tests/YGMeasureModeTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include struct _MeasureConstraint { diff --git a/tests/YGMeasureTest.cpp b/tests/YGMeasureTest.cpp index 0f12a06a..911f0c51 100644 --- a/tests/YGMeasureTest.cpp +++ b/tests/YGMeasureTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include static YGSize _measure(YGNodeRef node, diff --git a/tests/YGMemoryFuncTest.cpp b/tests/YGMemoryFuncTest.cpp index cc0681d7..bef2985c 100644 --- a/tests/YGMemoryFuncTest.cpp +++ b/tests/YGMemoryFuncTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include extern int32_t gNodeInstanceCount; diff --git a/tests/YGMinMaxDimensionTest.cpp b/tests/YGMinMaxDimensionTest.cpp index 2b51ae3d..2c6d3120 100644 --- a/tests/YGMinMaxDimensionTest.cpp +++ b/tests/YGMinMaxDimensionTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html -#include +#include #include TEST(YogaTest, max_width) { diff --git a/tests/YGPaddingTest.cpp b/tests/YGPaddingTest.cpp index 359d0235..aab6726b 100644 --- a/tests/YGPaddingTest.cpp +++ b/tests/YGPaddingTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html -#include +#include #include TEST(YogaTest, padding_no_size) { diff --git a/tests/YGRelayoutTest.cpp b/tests/YGRelayoutTest.cpp index 01cf4950..de298325 100644 --- a/tests/YGRelayoutTest.cpp +++ b/tests/YGRelayoutTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include TEST(YogaTest, dont_cache_computed_flex_basis_between_layouts) { diff --git a/tests/YGRoundingMeasureFuncTest.cpp b/tests/YGRoundingMeasureFuncTest.cpp index d6f5f6d4..6bbee0e3 100644 --- a/tests/YGRoundingMeasureFuncTest.cpp +++ b/tests/YGRoundingMeasureFuncTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include static YGSize _measureFloor(YGNodeRef node, diff --git a/tests/YGRoundingTest.cpp b/tests/YGRoundingTest.cpp index 00d6eedf..0ce9f5c0 100644 --- a/tests/YGRoundingTest.cpp +++ b/tests/YGRoundingTest.cpp @@ -9,7 +9,7 @@ // @Generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html -#include +#include #include TEST(YogaTest, rounding_flex_basis_flex_grow_row_width_of_100) { diff --git a/tests/YGStyleTest.cpp b/tests/YGStyleTest.cpp index 863cf52b..4eb7fd60 100644 --- a/tests/YGStyleTest.cpp +++ b/tests/YGStyleTest.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include +#include #include TEST(YogaTest, copy_style_same) { diff --git a/CSSLayout/YGEnums.h b/yoga/YGEnums.h similarity index 100% rename from CSSLayout/YGEnums.h rename to yoga/YGEnums.h diff --git a/CSSLayout/YGMacros.h b/yoga/YGMacros.h similarity index 100% rename from CSSLayout/YGMacros.h rename to yoga/YGMacros.h diff --git a/CSSLayout/YGNodeList.c b/yoga/YGNodeList.c similarity index 100% rename from CSSLayout/YGNodeList.c rename to yoga/YGNodeList.c diff --git a/CSSLayout/YGNodeList.h b/yoga/YGNodeList.h similarity index 100% rename from CSSLayout/YGNodeList.h rename to yoga/YGNodeList.h diff --git a/CSSLayout/Yoga.c b/yoga/Yoga.c similarity index 99% rename from CSSLayout/Yoga.c rename to yoga/Yoga.c index 32d7e489..29acb459 100644 --- a/CSSLayout/Yoga.c +++ b/yoga/Yoga.c @@ -2653,21 +2653,21 @@ inline bool YGIsExperimentalFeatureEnabled(YGExperimentalFeature feature) { return experimentalFeatures[feature]; } -void YGSetMemoryFuncs(YGMalloc YGMalloc, YGCalloc YGCalloc, YGRealloc YGRealloc, YGFree YGFree) { +void YGSetMemoryFuncs(YGMalloc ygmalloc, YGCalloc yccalloc, YGRealloc ygrealloc, YGFree ygfree) { YG_ASSERT(gNodeInstanceCount == 0, "Cannot set memory functions: all node must be freed first"); - YG_ASSERT((YGMalloc == NULL && YGCalloc == NULL && YGRealloc == NULL && YGFree == NULL) || - (YGMalloc != NULL && YGCalloc != NULL && YGRealloc != NULL && YGFree != NULL), + YG_ASSERT((ygmalloc == NULL && yccalloc == NULL && ygrealloc == NULL && ygfree == NULL) || + (ygmalloc != NULL && yccalloc != NULL && ygrealloc != NULL && ygfree != NULL), "Cannot set memory functions: functions must be all NULL or Non-NULL"); - if (YGMalloc == NULL || YGCalloc == NULL || YGRealloc == NULL || YGFree == NULL) { + if (ygmalloc == NULL || yccalloc == NULL || ygrealloc == NULL || ygfree == NULL) { gYGMalloc = &malloc; gYGCalloc = &calloc; gYGRealloc = &realloc; gYGFree = &free; } else { - gYGMalloc = YGMalloc; - gYGCalloc = YGCalloc; - gYGRealloc = YGRealloc; - gYGFree = YGFree; + gYGMalloc = ygmalloc; + gYGCalloc = yccalloc; + gYGRealloc = ygrealloc; + gYGFree = ygfree; } } diff --git a/CSSLayout/Yoga.h b/yoga/Yoga.h similarity index 98% rename from CSSLayout/Yoga.h rename to yoga/Yoga.h index e41a4cd9..c7bc600d 100644 --- a/CSSLayout/Yoga.h +++ b/yoga/Yoga.h @@ -175,6 +175,6 @@ WIN_EXPORT void YGSetExperimentalFeatureEnabled(YGExperimentalFeature feature, b WIN_EXPORT bool YGIsExperimentalFeatureEnabled(YGExperimentalFeature feature); WIN_EXPORT void -YGSetMemoryFuncs(YGMalloc cssMalloc, YGCalloc cssCalloc, YGRealloc cssRealloc, YGFree cssFree); +YGSetMemoryFuncs(YGMalloc ygmalloc, YGCalloc yccalloc, YGRealloc ygrealloc, YGFree ygfree); YG_EXTERN_C_END